macros: Add macro to automatically install any systemd sysusers files

This macros works very similar than the tmpfiles one but handles
sysusers files.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/macros/build.macro b/macros/build.macro
index 4eedd6a91f728dde7ddb6dfffbcdaee19ab51231..c19430a42fb3f291a83f5587cb378082b526778f 100644 (file)
--- a/macros/build.macro
+++ b/macros/build.macro
@@ -12,6 +12,7 @@ end
 def MACRO_INSTALL_FILES
        %{MACRO_INSTALL_DEFAULT_FILES}
        %{MACRO_INSTALL_SYSTEMD_FILES}
+       %{MACRO_INSTALL_SYSTEMD_SYSUSERS}
        %{MACRO_INSTALL_SYSTEMD_TMPFILES}
        %{MACRO_INSTALL_PAM_FILES}
 end

diff --git a/macros/systemd.macro b/macros/systemd.macro
index c67b9f9cc916dc715224da7235fd9cc66df3e1bd..7a40cff64f559677cc84c90b27937e1ee100524a 100644 (file)
--- a/macros/systemd.macro
+++ b/macros/systemd.macro
@@ -1,5 +1,3 @@
-SYSTEMD_SYSUSERS_DIR = /usr/lib/sysusers.d
-
 MACRO_INSTALL_SYSTEMD_FILES
        for file in %{DIR_SOURCE}/systemd/*; do
                [ -e "${file}" ] || continue
@@ -22,8 +20,8 @@ end
 MACRO_INSTALL_SYSTEMD_SYSUSERS
        for file in %{DIR_SOURCE}/*.sysusers; do
                [ -e "${file}" ] || continue
-               mkdir -p %{BUILDROOT}/%{SYSTEMD_SYSUSERS_DIR}
-               cp -vf ${file} %{BUILDROOT}/%{SYSTEMD_SYSUSERS_DIR}/$(basename ${file%*.sysusers}).conf
+               mkdir -pv %{BUILDROOT}/%{sysusersdir}
+               install -v -m 0644 ${file} %{BUILDROOT}/%{sysusersdir}/$(basename ${file%*.sysusers}).conf
        done
        unset file
 end