From: Karel Zak <kzak@redhat.com>
Date: Thu, 16 Jan 2025 16:42:13 +0000 (+0100)
Subject: meson: do not hardcode /var in uuidd-sysusers.conf.
X-Git-Tag: v2.42-start~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab7721b6cdb117c9c5cdee20fc5d1a8915f365bd;p=thirdparty%2Futil-linux.git

meson: do not hardcode /var in uuidd-sysusers.conf.

Let's follow the same approach as we use for other configuration files.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore
index 49e2e0e99..f2e2f8da0 100644
--- a/misc-utils/.gitignore
+++ b/misc-utils/.gitignore
@@ -3,6 +3,7 @@ uuidd.8
 uuidd.rc
 uuidd.service
 uuidd.socket
+uuidd-sysusers.conf
 uuidd-tmpfiles.conf
 lastlog2-import.service
 lastlog2-tmpfiles.conf
diff --git a/misc-utils/meson.build b/misc-utils/meson.build
index c9c0b220d..b10625fa7 100644
--- a/misc-utils/meson.build
+++ b/misc-utils/meson.build
@@ -107,11 +107,16 @@ if build_uuidd and systemd.found()
     uuidd_socket,
     install_dir : systemdsystemunitdir)
 
+  uuidd_sysusers = configure_file(
+    input : 'uuidd-sysusers.conf.in',
+    output : 'uuidd-sysusers.conf',
+    configuration : conf)
   install_data(
-    'uuidd-sysusers.conf',
+    uuidd_sysusers,
     install_dir: systemd_sysusers_dir,
     rename : 'uuidd.conf')
 endif
+
 if build_uuidd and sysvinit
   uuidd_rc = configure_file(
     input : 'uuidd.rc.in',
diff --git a/misc-utils/uuidd-sysusers.conf b/misc-utils/uuidd-sysusers.conf
deleted file mode 100644
index afd02eb37..000000000
--- a/misc-utils/uuidd-sysusers.conf
+++ /dev/null
@@ -1 +0,0 @@
-u uuidd - "UUID generator helper daemon" /var/lib/libuuid
diff --git a/misc-utils/uuidd-sysusers.conf.in b/misc-utils/uuidd-sysusers.conf.in
new file mode 100644
index 000000000..c33c49f2a
--- /dev/null
+++ b/misc-utils/uuidd-sysusers.conf.in
@@ -0,0 +1 @@
+u uuidd - "UUID generator helper daemon" @localstatedir@/lib/libuuid