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

Improve filetriggers to run in all required situations

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-11-21 21:08:43 -05:00
parent 56be258e41
commit dc105f307e
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
systemd.spec
View File

@ -346,11 +346,37 @@ test -z "$(grep -L xml:lang %{buildroot}%{_datadir}/polkit-1/actions/org.freedes
############################################################################################# #############################################################################################
# This will run after any package is initially installed or
# upgraded. We care about the case where a package is initially
# installed, because other cases are covered by the scriptlets below,
# so sometimes we will reload needlessly.
%transfiletriggerin -- /usr/lib/systemd/system /etc/systemd/system %transfiletriggerin -- /usr/lib/systemd/system /etc/systemd/system
systemctl daemon-reload &>/dev/null || : systemctl daemon-reload &>/dev/null || :
# On removal, we need to run daemon-reload after any units have been
# removed. %transfilepostun would be ideal, but it does not get
# executed for some reason.
# On upgrade, we need to run daemon-reload after any new unit files
# have been installed, but before %postun scripts in packages get
# executed. %transfiletriggerun gets the right list of files
# but it is invoked too early (before changes happen).
# %filetriggerpostun happens at the right time, but it fires for
# every package.
# To execute the reload at the right time, we create a state
# file in %transfiletriggerun and execute the daemon-reload in
# the first %filetriggerpostun.
%transfiletriggerun -- /usr/lib/systemd/system /etc/systemd/system %transfiletriggerun -- /usr/lib/systemd/system /etc/systemd/system
systemctl daemon-reload &>/dev/null || : mkdir -p %{_localstatedir}/lib/rpm-state/systemd
touch %{_localstatedir}/lib/rpm-state/systemd/needs-reload
%filetriggerpostun -- /usr/lib/systemd/system /etc/systemd/system
if [ -e %{_localstatedir}/lib/rpm-state/systemd/needs-reload ]; then
rm %{_localstatedir}/lib/rpm-state/systemd/needs-reload || :
rmdir %{_localstatedir}/lib/rpm-state/systemd || :
systemctl daemon-reload || :
fi
%pre %pre
getent group cdrom >/dev/null 2>&1 || groupadd -r -g 11 cdrom >/dev/null 2>&1 || : getent group cdrom >/dev/null 2>&1 || groupadd -r -g 11 cdrom >/dev/null 2>&1 || :
@ -715,6 +741,8 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{pkgdir}/boot/efi/*.stub %{pkgdir}/boot/efi/*.stub
%endif %endif
%ghost %dir %{_localstatedir}/lib/rpm-state/systemd
%files libs %files libs
%{_libdir}/security/pam_systemd.so %{_libdir}/security/pam_systemd.so
%{_libdir}/libnss_myhostname.so.2 %{_libdir}/libnss_myhostname.so.2