summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-13 19:18:55 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-13 20:11:59 +0200
commitb532bdeae9b13fe93a54850f5e7f99c753bda6fa (patch)
treed4efc065957b48a7d4f73f1d4c6266d397d7ef0d /src/core
parent8cf7c96517c3688d29b30651adcda9e71e7fcb07 (diff)
rpm: add RPM macros to apply sysusers, sysctl, and binfmt drop-ins
With this in place RPMs can make sure that whatever they drop in is immeidately applied, and not delayed until next reboot. This also moves systemd-sysusers back to /usr/bin, since hardcoding the path to /usr/lib in the macros would mean compatibility breaks in future, should we turn sysusers into a command that is actually OK for people to call directly. And given that that is quite likely to happen (since it is useful to prepare images with its --root= switch), let's just prepare for it.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/macros.systemd.in14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
index 167016a85a..0d5f8949ab 100644
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -26,7 +26,9 @@
%_udevrulesdir @udevrulesdir@
%_journalcatalogdir @catalogdir@
%_tmpfilesdir @tmpfilesdir@
+%_sysusersdir @sysusersdir@
%_sysctldir @sysctldir@
+%_binfmtdir @binfmtdir@
%systemd_requires \
Requires(post): systemd \
@@ -76,3 +78,15 @@ journalctl --update-catalog >/dev/null 2>&1 || : \
%tmpfiles_create() \
systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \
%{nil}
+
+%sysusers_create() \
+systemd-sysusers %{?*} >/dev/null 2>&1 || : \
+%{nil}
+
+%sysctl_apply() \
+@rootlibexecdir@/systemd-sysctl %{?*} >/dev/null 2>&1 || : \
+%{nil}
+
+%binfmt_apply() \
+@rootlibexecdir@/systemd-binfmt %{?*} >/dev/null 2>&1 || : \
+%{nil}