Heed warnings about macro being expanded in comment

%systemd_{post,user_post} are multiline macros, so commenting them out
was not effective, and the macros were still being executed.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-04-09 16:31:27 +02:00
parent 5fb60a5cd2
commit e9a9a15585

View File

@ -75,8 +75,9 @@ getent passwd %{dbus_user_id} >/dev/null || \
# fedora presets (in 'fedora-release'). To break this, we explicitly enable
# dbus-broker here. Once the presets are in, we will be able to drop the
# explicit 'enable' calls and rely on the presets below.
#%systemd_post dbus-broker.service
#%systemd_user_post dbus-broker.service
#systemd_post dbus-broker.service
#systemd_user_post dbus-broker.service
if [ $1 -eq 1 ] ; then
/usr/bin/systemctl --no-reload disable dbus-daemon.service &>/dev/null || :
/usr/bin/systemctl --no-reload --global disable dbus-daemon.service &>/dev/null || :