Merge branch 'uuiddd-sysusers' of https://github.com/keszybz/util-linux

* 'uuiddd-sysusers' of https://github.com/keszybz/util-linux:
  lastlog2,uuidd: rename tmpfiles config file
  uuidd: add sysusers file

meson.build

@@ -919,6 +919,11 @@ if systemd.found()
   systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemdsystemunitdir')
 endif
 
+systemd_sysusers_dir = ''
+if systemd.found()
+  systemd_sysusers_dir = systemd.get_variable(pkgconfig : 'sysusers_dir')
+endif
+
 sysvinit = get_option('sysvinit').enabled()
 sysvinitrcdir = sysconfdir + '/init.d'
 

misc-utils/meson.build

@@ -69,7 +69,8 @@ if build_liblastlog2 and systemd.found()
     configuration : conf)
   install_data(
     lastlog2_tmpfiles,
-    install_dir : '/usr/lib/tmpfiles.d')
+    install_dir : '/usr/lib/tmpfiles.d',
+    rename : 'lastlog2.conf')
 
   lastlog2_service = configure_file(
     input : 'lastlog2-import.service.in',
@@ -87,7 +88,8 @@ if build_uuidd and systemd.found()
     configuration : conf)
   install_data(
     uuidd_tmpfiles,
-    install_dir : '/usr/lib/tmpfiles.d')
+    install_dir : '/usr/lib/tmpfiles.d',
+    rename : 'uuidd.conf')
 
   uuidd_service = configure_file(
     input : 'uuidd.service.in',
@@ -104,6 +106,11 @@ if build_uuidd and systemd.found()
   install_data(
     uuidd_socket,
     install_dir : systemdsystemunitdir)
+
+  install_data(
+    'uuidd-sysusers.conf',
+    install_dir: systemd_sysusers_dir,
+    rename : 'uuidd.conf')
 endif
 if build_uuidd and sysvinit
   uuidd_rc = configure_file(

misc-utils/uuidd-sysusers.conf

@@ -0,0 +1 @@
+u uuidd - "UUID generator helper daemon" /var/lib/libuuid