From 993f682ecc7f09ab3a6c61349f3b4311f90bb627 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Aug 07 2023 12:51:12 +0000 Subject: Revert "Supress errors on selinux systems" 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 1d712f8acf96060d022b215d51aee4a13d9f84ca. --- diff --git a/triggers.systemd b/triggers.systemd index 719789b..f8bb078 100644 --- a/triggers.systemd +++ b/triggers.systemd @@ -17,11 +17,7 @@ /usr/lib/systemd/systemd-update-helper system-reload-restart || : %transfiletriggerin -P 900899 -- /usr/lib/systemd/user /etc/systemd/user -if selinuxenabled &>/dev/null; then - /usr/lib/systemd/systemd-update-helper user-reload-restart 2>/dev/null || : -else - /usr/lib/systemd/systemd-update-helper user-reload-restart || : -fi +/usr/lib/systemd/systemd-update-helper user-reload-restart || : %transfiletriggerpostun -P 1000100 -- /usr/lib/systemd/system /etc/systemd/system # 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 # Execute daemon-reload in user managers. -if selinuxenabled &>/dev/null; then - /usr/lib/systemd/systemd-update-helper user-reload 2>/dev/null || : -else - /usr/lib/systemd/systemd-update-helper user-reload || : -fi +/usr/lib/systemd/systemd-update-helper user-reload || : %transfiletriggerpostun -P 10000 -- /usr/lib/systemd/system /etc/systemd/system # 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 # We restart remaining user services that should be restarted here. -if selinuxenabled &>/dev/null; then - /usr/lib/systemd/systemd-update-helper user-restart 2>/dev/null || : -else - /usr/lib/systemd/systemd-update-helper user-restart || : -fi +/usr/lib/systemd/systemd-update-helper user-restart || : %transfiletriggerin -P 1000700 -- /usr/lib/sysusers.d # This script will process files installed in /usr/lib/sysusers.d to create