rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Supress errors on selinux systems"

Browse Source 
The selinux policy was modified in
https://github.com/fedora-selinux/selinux-policy/pull/944
to allow the reload to happen, so let's revert the silencing of
the logging.

This reverts commit 1d712f8acf.
This commit is contained in:
Daan De Meyer 2023-08-07 13:59:52 +02:00 committed by zbyszek
parent 2b6870dbdc
commit 993f682ecc
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
triggers.systemd
View File

@ -17,11 +17,7 @@
/usr/lib/systemd/systemd-update-helper system-reload-restart || : /usr/lib/systemd/systemd-update-helper system-reload-restart || :
%transfiletriggerin -P 900899 -- /usr/lib/systemd/user /etc/systemd/user %transfiletriggerin -P 900899 -- /usr/lib/systemd/user /etc/systemd/user
if selinuxenabled &>/dev/null; then /usr/lib/systemd/systemd-update-helper user-reload-restart || :
/usr/lib/systemd/systemd-update-helper user-reload-restart 2>/dev/null || :
else
/usr/lib/systemd/systemd-update-helper user-reload-restart || :
fi
%transfiletriggerpostun -P 1000100 -- /usr/lib/systemd/system /etc/systemd/system %transfiletriggerpostun -P 1000100 -- /usr/lib/systemd/system /etc/systemd/system
# On removal, we need to run daemon-reload after any units have been # On removal, we need to run daemon-reload after any units have been
@ -33,11 +29,7 @@ fi
%transfiletriggerpostun -P 1000099 -- /usr/lib/systemd/user /etc/systemd/user %transfiletriggerpostun -P 1000099 -- /usr/lib/systemd/user /etc/systemd/user
# Execute daemon-reload in user managers. # Execute daemon-reload in user managers.
if selinuxenabled &>/dev/null; then /usr/lib/systemd/systemd-update-helper user-reload || :
/usr/lib/systemd/systemd-update-helper user-reload 2>/dev/null || :
else
/usr/lib/systemd/systemd-update-helper user-reload || :
fi
%transfiletriggerpostun -P 10000 -- /usr/lib/systemd/system /etc/systemd/system %transfiletriggerpostun -P 10000 -- /usr/lib/systemd/system /etc/systemd/system
# We restart remaining system services that should be restarted here. # We restart remaining system services that should be restarted here.
@ -45,11 +37,7 @@ fi
%transfiletriggerpostun -P 9999 -- /usr/lib/systemd/user /etc/systemd/user %transfiletriggerpostun -P 9999 -- /usr/lib/systemd/user /etc/systemd/user
# We restart remaining user services that should be restarted here. # We restart remaining user services that should be restarted here.
if selinuxenabled &>/dev/null; then /usr/lib/systemd/systemd-update-helper user-restart || :
/usr/lib/systemd/systemd-update-helper user-restart 2>/dev/null || :
else
/usr/lib/systemd/systemd-update-helper user-restart || :
fi
%transfiletriggerin -P 1000700 -- /usr/lib/sysusers.d %transfiletriggerin -P 1000700 -- /usr/lib/sysusers.d
# This script will process files installed in /usr/lib/sysusers.d to create # This script will process files installed in /usr/lib/sysusers.d to create