From 2a3e3b284acd9db2c30d66b2f123b6c9a45b1110 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Sat, 1 Apr 2023 10:18:02 +0200 Subject: [PATCH] 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 Signed-off-by: Michael Tremer --- macros/build.macro | 1 + macros/systemd.macro | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/macros/build.macro b/macros/build.macro index 4eedd6a9..c19430a4 100644 --- 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 c67b9f9c..7a40cff6 100644 --- 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 -- 2.47.3