From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 1 Apr 2023 08:18:02 +0000 (+0200)
Subject: macros: Add macro to automatically install any systemd sysusers files
X-Git-Tag: 0.9.29~203
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a3e3b284acd9db2c30d66b2f123b6c9a45b1110;p=pakfire.git

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 4eedd6a91..c19430a42 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 c67b9f9cc..7a40cff64 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