From: Christian Hesse <mail@eworm.de>
Date: Thu, 22 Feb 2024 07:48:55 +0000 (+0100)
Subject: tmpfiles: add and install for uuidd, generate /run/uuidd & /var/lib/libuuid
X-Git-Tag: v2.42-start~507
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b7410544c90f56fbb9abca999ed48feffbe31ef;p=thirdparty%2Futil-linux.git

tmpfiles: add and install for uuidd, generate /run/uuidd & /var/lib/libuuid

These directories are requird for uuidd, so let systemd-tmpfiles create them.

Signed-off-by: Christian Hesse <mail@eworm.de>
---

diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore
index 24b40acaf..9cde348d8 100644
--- a/misc-utils/.gitignore
+++ b/misc-utils/.gitignore
@@ -2,6 +2,7 @@ getopt.1
 uuidd.8
 uuidd.rc
 uuidd.service
-lastlog2-import.service
 uuidd.socket
+uuidd-tmpfiles.conf
+lastlog2-import.service
 lastlog2.conf
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 514b27adc..f17751d52 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -150,6 +150,7 @@ uuidd_SOURCES = misc-utils/uuidd.c lib/monotonic.c lib/timer.c
 if HAVE_SYSTEMD
 uuidd_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_DAEMON_LIBS)
 uuidd_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS)
+tmpfiles_DATA += misc-utils/uuidd-tmpfiles.conf
 systemdsystemunit_DATA += \
 	misc-utils/uuidd.service \
 	misc-utils/uuidd.socket
@@ -164,7 +165,8 @@ endif # BUILD_UUIDD
 PATHFILES += \
 	misc-utils/uuidd.rc \
 	misc-utils/uuidd.service \
-	misc-utils/uuidd.socket
+	misc-utils/uuidd.socket \
+	misc-utils/uuidd-tmpfiles.conf
 
 if BUILD_BLKID
 sbin_PROGRAMS += blkid
diff --git a/misc-utils/meson.build b/misc-utils/meson.build
index 6a7dd8cee..cde0baeae 100644
--- a/misc-utils/meson.build
+++ b/misc-utils/meson.build
@@ -97,6 +97,14 @@ if build_liblastlog2
 endif
 
 if build_uuidd and systemd.found()
+  uuidd_tmpfiles = configure_file(
+    input : 'uuidd-tmpfiles.conf.in',
+    output : 'uuidd-tmpfiles.conf',
+    configuration : conf)
+  install_data(
+    uuidd_tmpfiles,
+    install_dir : '/usr/lib/tmpfiles.d')
+
   uuidd_service = configure_file(
     input : 'uuidd.service.in',
     output : 'uuidd.service',
diff --git a/misc-utils/uuidd-tmpfiles.conf.in b/misc-utils/uuidd-tmpfiles.conf.in
new file mode 100644
index 000000000..9c2005bdf
--- /dev/null
+++ b/misc-utils/uuidd-tmpfiles.conf.in
@@ -0,0 +1,6 @@
+# This file is part of uuidd.
+#
+# See tmpfiles.d(5) for details
+#
+d @runstatedir@/uuidd 2775 uuidd uuidd -
+d /var/lib/libuuid 0755 uuidd uuidd -