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

Use shell for triggers; see https://github.com/systemd/systemd/pull/8550

Browse Source 
This fixes compatibility with rpm-ostree.
This commit is contained in:
Colin Walters 2018-03-27 20:37:29 +00:00
parent f770414d95
commit 8e6b39457b
2 changed files with 79 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
systemd.spec
View File

@ -13,7 +13,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 238 Version: 238
Release: 5%{?gitcommit:.git%{gitcommitshort}}%{?dist} Release: 6%{?gitcommit:.git%{gitcommitshort}}%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Summary: System and Service Manager Summary: System and Service Manager
@ -706,6 +706,10 @@ fi
%files tests -f .file-list-tests %files tests -f .file-list-tests
%changelog %changelog
* Tue Mar 27 2018 Colin Walters <walters@verbum.org>
- Use shell for triggers; see https://github.com/systemd/systemd/pull/8550
This fixes compatibility with rpm-ostree.
* Tue Mar 20 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 238-5 * Tue Mar 20 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 238-5
- Backport patch to revert inadvertent change of "predictable" interface name (#1558027) - Backport patch to revert inadvertent change of "predictable" interface name (#1558027)

197
triggers.systemd
View File

@ -23,136 +23,87 @@
# #
# Minimum rpm version supported: 4.13.0 # Minimum rpm version supported: 4.13.0
%transfiletriggerin -P 900900 -p <lua> -- /usr/lib/systemd/system /etc/systemd/system %transfiletriggerin -P 900900 -- /usr/lib/systemd/system /etc/systemd/system
-- This script will run after any package is initially installed or # This script will run after any package is initially installed or
-- upgraded. We care about the case where a package is initially # upgraded. We care about the case where a package is initially
-- installed, because other cases are covered by the *un scriptlets, # installed, because other cases are covered by the *un scriptlets,
-- so sometimes we will reload needlessly. # so sometimes we will reload needlessly.
if test -d /run/systemd/system; then
%{_bindir}/systemctl daemon-reload
fi
if posix.access("/run/systemd/system") then %transfiletriggerun -- /usr/lib/systemd/system /etc/systemd/system
pid = posix.fork() # On removal, we need to run daemon-reload after any units have been
if pid == 0 then # removed. %transfiletriggerpostun would be ideal, but it does not get
assert(posix.exec("%{_bindir}/systemctl", "daemon-reload")) # executed for some reason.
elseif pid > 0 then # On upgrade, we need to run daemon-reload after any new unit files
posix.wait(pid) # have been installed, but before %postun scripts in packages get
end # executed. %transfiletriggerun gets the right list of files
end # 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 -p <lua> -- /usr/lib/systemd/system /etc/systemd/system if test -d "/run/systemd/system"; then
-- On removal, we need to run daemon-reload after any units have been mkdir -p %{_localstatedir}/lib/rpm-state/systemd"
-- removed. %transfiletriggerpostun would be ideal, but it does not get touch %{_localstatedir}/lib/rpm-state/systemd/needs-reload"
-- executed for some reason. fi
-- 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.
if posix.access("/run/systemd/system") then %filetriggerpostun -P 1000100 -- /usr/lib/systemd/system /etc/systemd/system
posix.mkdir("%{_localstatedir}/lib") if test -f "%{_localstatedir}/lib/rpm-state/systemd/needs-reload"; then
posix.mkdir("%{_localstatedir}/lib/rpm-state") rm -rf "%{_localstatedir}/lib/rpm-state/systemd"
posix.mkdir("%{_localstatedir}/lib/rpm-state/systemd") %{_bindir}/systemctl daemon-reload
io.open("%{_localstatedir}/lib/rpm-state/systemd/needs-reload", "w") fi
end
%filetriggerpostun -P 1000100 -p <lua> -- /usr/lib/systemd/system /etc/systemd/system %transfiletriggerin -P 100700 -- /usr/lib/sysusers.d
if posix.access("%{_localstatedir}/lib/rpm-state/systemd/needs-reload") then # This script will process files installed in /usr/lib/sysusers.d to create
posix.unlink("%{_localstatedir}/lib/rpm-state/systemd/needs-reload") # specified users automatically. The priority is set such that it
posix.rmdir("%{_localstatedir}/lib/rpm-state/systemd") # will run before the tmpfiles file trigger.
pid = posix.fork() if test -d /run/systemd/system; then
if pid == 0 then %{_bindir}/systemd-sysusers
assert(posix.exec("%{_bindir}/systemctl", "daemon-reload")) fi
elseif pid > 0 then
posix.wait(pid)
end
end
%transfiletriggerin -P 100700 -p <lua> -- /usr/lib/sysusers.d %transfiletriggerin -P 100500 -- /usr/lib/tmpfiles.d
-- This script will process files installed in /usr/lib/sysusers.d to create # This script will process files installed in /usr/lib/tmpfiles.d to create
-- specified users automatically. The priority is set such that it # tmpfiles automatically. The priority is set such that it will run
-- will run before the tmpfiles file trigger. # after the sysusers file trigger, but before any other triggers.
if posix.access("/run/systemd/system") then if test -d /run/systemd/system; then
pid = posix.fork() %{_bindir}/systemd-tmpfiles --create
if pid == 0 then fi
assert(posix.exec("%{_bindir}/systemd-sysusers"))
elseif pid > 0 then
posix.wait(pid)
end
end
%transfiletriggerin -P 100500 -p <lua> -- /usr/lib/tmpfiles.d %transfiletriggerin -- /usr/lib/udev/hwdb.d
-- This script will process files installed in /usr/lib/tmpfiles.d to create # This script will automatically invoke hwdb update if files have been
-- tmpfiles automatically. The priority is set such that it will run # installed or updated in /usr/lib/udev/hwdb.d.
-- after the sysusers file trigger, but before any other triggers. if test -d /run/systemd/system; then
if posix.access("/run/systemd/system") then %{_bindir}/systemd-hwdb update
pid = posix.fork() fi
if pid == 0 then
assert(posix.exec("%{_bindir}/systemd-tmpfiles", "--create"))
elseif pid > 0 then
posix.wait(pid)
end
end
%transfiletriggerin udev -p <lua> -- /usr/lib/udev/hwdb.d %transfiletriggerin -- /usr/lib/systemd/catalog
-- This script will automatically invoke hwdb update if files have been # This script will automatically invoke journal catalog update if files
-- installed or updated in /usr/lib/udev/hwdb.d. # have been installed or updated in /usr/lib/systemd/catalog.
if posix.access("/run/systemd/system") then if test -d /run/systemd/system; then
pid = posix.fork() %{_bindir}/journalctl --update-catalog
if pid == 0 then fi
assert(posix.exec("%{_bindir}/systemd-hwdb", "update"))
elseif pid > 0 then
posix.wait(pid)
end
end
%transfiletriggerin -p <lua> -- /usr/lib/systemd/catalog %transfiletriggerin -- /usr/lib/udev/rules.d
-- This script will automatically invoke journal catalog update if files # This script will automatically update udev with new rules if files
-- have been installed or updated in /usr/lib/systemd/catalog. # have been installed or updated in /usr/lib/udev/rules.d.
if posix.access("/run/systemd/system") then if test -d /run/systemd/system; then
pid = posix.fork() %{_bindir}/udevadm control --reload
if pid == 0 then fi
assert(posix.exec("%{_bindir}/journalctl", "--update-catalog"))
elseif pid > 0 then
posix.wait(pid)
end
end
%transfiletriggerin udev -p <lua> -- /usr/lib/udev/rules.d %transfiletriggerin -- /usr/lib/sysctl.d
-- This script will automatically update udev with new rules if files # This script will automatically apply sysctl rules if files have been
-- have been installed or updated in /usr/lib/udev/rules.d. # installed or updated in /usr/lib/sysctl.d.
if posix.access("/run/systemd/system") then if test -d /run/systemd/system; then
pid = posix.fork() /usr/lib/systemd/systemd-sysctl
if pid == 0 then fi
assert(posix.exec("%{_bindir}/udevadm", "control", "--reload"))
elseif pid > 0 then
posix.wait(pid)
end
end
%transfiletriggerin -p <lua> -- /usr/lib/sysctl.d %transfiletriggerin -- /usr/lib/binfmt.d
-- This script will automatically apply sysctl rules if files have been # This script will automatically apply binfmt rules if files have been
-- installed or updated in /usr/lib/sysctl.d. # installed or updated in /usr/lib/binfmt.d.
if posix.access("/run/systemd/system") then if test -d /run/systemd/system; then
pid = posix.fork() /usr/lib/systemd/systemd-binfmt
if pid == 0 then fi
assert(posix.exec("/usr/lib/systemd/systemd-sysctl"))
elseif pid > 0 then
posix.wait(pid)
end
end
%transfiletriggerin -p <lua> -- /usr/lib/binfmt.d
-- This script will automatically apply binfmt rules if files have been
-- installed or updated in /usr/lib/binfmt.d.
if posix.access("/run/systemd/system") then
pid = posix.fork()
if pid == 0 then
assert(posix.exec("/usr/lib/systemd/systemd-binfmt"))
elseif pid > 0 then
posix.wait(pid)
end
end