Skip to content

BZ 1956836: overlay: Add rhcos-usrlocal-selinux-fixup.service #551

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

Merged
openshift-merge-robot merged 1 commit into from
May 21, 2021
Merged

BZ 1956836: overlay: Add rhcos-usrlocal-selinux-fixup.service #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions overlay.d/05rhcos/usr/lib/systemd/system-preset/43-manifest-rhcos.preset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# live in the manifest and some of them from the redhat-release-coreos
# package.

# Upgrade fixes
enable rhcos-usrlocal-selinux-fixup.service
# Enable the iscsi workaround
enable coreos-generate-iscsi-initiatorname.service
# Enable GCP routes
Expand Down
19 changes: 19 additions & 0 deletions overlay.d/05rhcos/usr/lib/systemd/system/rhcos-usrlocal-selinux-fixup.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[Unit]
Description=RHCOS Fix SELinux Labeling For /usr/local/sbin
Documentation=https://bugzilla.redhat.com/1956836
DefaultDependencies=false
After=systemd-tmpfiles-setup.service local-fs.target
Before=sysinit.target
ConditionPathExists=/var/usrlocal/sbin

[Service]
Type=oneshot
RemainAfterExit=yes
# Run every time because systemd-tmpfiles will reset it to the incorrect
# context on each boot.
ExecStart=chcon -v --reference=/usr/sbin /usr/local/sbin
# Only do this recursive relabeling once.
ExecStart=/bin/sh -c 'if ! test -f /var/lib/.coreos-usrlocal-fixup.stamp; then find /var/usrlocal/sbin -executable -mount -exec chcon -v --reference=/usr/sbin {} \; && touch /var/lib/.coreos-usrlocal-fixup.stamp; fi'

[Install]
WantedBy=sysinit.target
8 changes: 8 additions & 0 deletions tests/kola/misc-ro/misc-ro.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ echo "ok iSCSI initiator name"
systemctl is-enabled logrotate.timer
echo "ok logrotate"

bin_ctx=$(stat -c %C /usr/sbin)
usrlocal_sbin_ctx=$(stat -c %C /var/usrlocal/sbin)
if test "${bin_ctx}" != "${usrlocal_sbin_ctx}"; then
fatal "/usr/sbin is ${bin_ctx} but /var/usrlocal/sbin is ${usrlocal_sbin_ctx}"
fi
test -f /var/lib/.coreos-usrlocal-fixup.stamp
echo "ok usr/local/sbin fixup"

rpm -q conntrack-tools
test ! -f /usr/lib/systemd/system/conntrackd.service
echo "ok conntrack tools without daemon"
Expand Down