SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework file trigger scripts to fire at the right time

Browse Source 
This turns out to be more complicated than it looked initially...
%transfiletriggerun is called early, while %transfiletriggerin is
called late, and neither satifisfies the requirement to call
daemon-reload after new unit files have been installed, but before
%postun scripts in packages get to fire.

It seems that the only solution is to use %filetriggerun (which
is called once per package) to do the reload, and keep state in
/var/lib/rpm-state/systemd/ to avoid calling the reload multiple
times.

https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Saving_state_between_scriptlets
says that /var/lib/rpm-state/systemd/ is the right dir.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2015-11-22 20:09:17 -05:00
parent 873e413323
commit b7cf9ac00a
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/triggers.systemd.in
+27 -1
View File
@@ -19,8 +19,34 @@
# The contents of this are an example to be copied into systemd.spec.
# 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 -- @systemunitdir@ /etc/systemd/system
systemctl daemon-reload &>/dev/null || :
# On removal, we need to run daemon-reload after any units have been
# removed. %transfiletriggerpostun 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 -- @systemunitdir@ /etc/systemd/system
systemctl daemon-reload &>/dev/null || :
mkdir -p %{_localstatedir}/lib/rpm-state/systemd
touch %{_localstatedir}/lib/rpm-state/systemd/needs-reload
%filetriggerpostun -- @systemunitdir@ /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