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

Convert file trigger scripts to lua

Browse Source 
At least the %filetriggerpostun script can be invoked hundreds of
times during an upgrade, so it makes sense to optimize it a bit.

assert(exec(...)) is used because of https://bugzilla.redhat.com/show_bug.cgi?id=1094072.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-11-22 19:54:57 -05:00
parent dc105f307e
commit 80f2df5146
1 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
systemd.spec
View File

@ -346,37 +346,49 @@ test -z "$(grep -L xml:lang %{buildroot}%{_datadir}/polkit-1/actions/org.freedes
############################################################################################# #############################################################################################
# This will run after any package is initially installed or %transfiletriggerin -P 900900 -p <lua> -- /usr/lib/systemd/system /etc/systemd/system
# upgraded. We care about the case where a package is initially -- This will run after any package is initially installed or
# installed, because other cases are covered by the scriptlets below, -- upgraded. We care about the case where a package is initially
# so sometimes we will reload needlessly. -- installed, because other cases are covered by the scriptlets below,
-- so sometimes we will reload needlessly.
%transfiletriggerin -- /usr/lib/systemd/system /etc/systemd/system pid = posix.fork()
systemctl daemon-reload &>/dev/null || : if pid == 0 then
assert(posix.exec("%{_bindir}/systemctl", "daemon-reload"))
elseif pid > 0 then
posix.wait(pid)
end
# On removal, we need to run daemon-reload after any units have been %transfiletriggerun -p <lua> -- /usr/lib/systemd/system /etc/systemd/system
# removed. %transfilepostun would be ideal, but it does not get -- On removal, we need to run daemon-reload after any units have been
# executed for some reason. -- removed. %transfiletriggerpostun would be ideal, but it does not get
# On upgrade, we need to run daemon-reload after any new unit files -- executed for some reason.
# have been installed, but before %postun scripts in packages get -- On upgrade, we need to run daemon-reload after any new unit files
# executed. %transfiletriggerun gets the right list of files -- have been installed, but before %postun scripts in packages get
# but it is invoked too early (before changes happen). -- executed. %transfiletriggerun gets the right list of files
# %filetriggerpostun happens at the right time, but it fires for -- but it is invoked too early (before changes happen).
# every package. -- %filetriggerpostun happens at the right time, but it fires for
# To execute the reload at the right time, we create a state -- every package.
# file in %transfiletriggerun and execute the daemon-reload in -- To execute the reload at the right time, we create a state
# the first %filetriggerpostun. -- file in %transfiletriggerun and execute the daemon-reload in
-- the first %filetriggerpostun.
%transfiletriggerun -- /usr/lib/systemd/system /etc/systemd/system posix.mkdir("%{_localstatedir}/lib")
mkdir -p %{_localstatedir}/lib/rpm-state/systemd posix.mkdir("%{_localstatedir}/lib/rpm-state")
touch %{_localstatedir}/lib/rpm-state/systemd/needs-reload posix.mkdir("%{_localstatedir}/lib/rpm-state/systemd")
io.open("%{_localstatedir}/lib/rpm-state/systemd/needs-reload", "w")
%filetriggerpostun -- /usr/lib/systemd/system /etc/systemd/system %filetriggerpostun -P 1000100 -p <lua> -- /usr/lib/systemd/system /etc/systemd/system
if [ -e %{_localstatedir}/lib/rpm-state/systemd/needs-reload ]; then if posix.access("%{_localstatedir}/lib/rpm-state/systemd/needs-reload") then
rm %{_localstatedir}/lib/rpm-state/systemd/needs-reload || : posix.unlink("%{_localstatedir}/lib/rpm-state/systemd/needs-reload")
rmdir %{_localstatedir}/lib/rpm-state/systemd || : posix.rmdir("%{_localstatedir}/lib/rpm-state/systemd")
systemctl daemon-reload || : pid = posix.fork()
fi if pid == 0 then
assert(posix.exec("%{_bindir}/systemctl", "daemon-reload"))
elseif pid > 0 then
posix.wait(pid)
end
end
%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 || :