Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

overlay: update selinux update script from 05rhcos #583

Merged
merged 3 commits into from
Apr 19, 2023
Merged

overlay: update selinux update script from 05rhcos #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7249872
overlay: update selinux update script from 05rhcos
MattPOlson Apr 18, 2023
aca680c
Dockerfile: copy overlays one by one
vrutkovs Apr 19, 2023
b612979
okd overlay: rebuild selinux policy if policy.33 file changed
vrutkovs Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ADD overrides.yaml /etc/rpm-ostree/origin.d/overrides.yaml
RUN cat /etc/os-release \
&& rpm-ostree --version \
&& ostree --version \
&& cp -irvf overlay.d/*/* / \
&& for overlay in overlay.d/*; do cp -rvf ${overlay}/* /; done \
&& cp -irvf bootstrap / \
&& cp -irvf manifests / \
&& cp -ivf *.repo /etc/yum.repos.d/ \
Expand Down
9 changes: 9 additions & 0 deletions overlay.d/99okd/usr/libexec/rhcos-rebuild-selinux-policy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
# Executed by rhcos-selinux-policy-upgrade.service
set -euo pipefail

ls -al /{usr/,}etc/selinux/targeted/policy/policy.33
if ! cmp --quiet /{usr/,}etc/selinux/targeted/policy/policy.33; then
echo "Recompiling policy due to local modifications as workaround for https://bugzilla.redhat.com/2057497"
semodule -B
fi