autotools: add sysusers support

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

diff --git a/Makefile.am b/Makefile.am
index b1be799b975242f8a3dce5d0b6b043be7d2243e3..544d9eff5edce0cdaa34941837c29036edbe7866 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,7 @@ sbin_PROGRAMS =
 dist_usrbin_exec_SCRIPTS =
 systemdsystemunit_DATA =
 tmpfiles_DATA =
+sysusers_DATA =
 dist_bashcompletion_DATA =
 check_PROGRAMS =
 dist_check_SCRIPTS =
@@ -360,7 +361,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-python \
        --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \
-       --with-tmpfilesdir=$$dc_install_base/$(tmpfilesdir)
+       --with-tmpfilesdir=$$dc_install_base/$(tmpfilesdir) \
+       --with-sysusersdir=$$dc_install_base/$(sysusersdir)
 
 BUILT_SOURCES += .version
 .version:

diff --git a/configure.ac b/configure.ac
index a1d68f0593e4b9c86a5e87e10609b2b777475a46..07b50899952281107e9f76a8ac1a743353e39a45 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2729,6 +2729,20 @@ AS_IF([test "x$with_tmpfilesdir" != "xno"], [
   AC_SUBST([tmpfilesdir], [$with_tmpfilesdir])
 ])
 
+
+AC_ARG_WITH([sysusersdir],
+  AS_HELP_STRING([--with-sysusersdir=DIR], [directory for sysusers. See sysusers.d(5) for details]),
+  [], [
+  AS_IF([test "x$have_systemd" = xyes], [
+    PKG_CHECK_VAR([with_sysusersdir], [systemd], [sysusersdir],
+      [],
+      [with_sysusersdir=no])
+  ])
+])
+AS_IF([test "x$with_sysusersdir" != "xno"], [
+  AC_SUBST([sysusersdir], [$with_sysusersdir])
+])
+
 AC_ARG_WITH([smack],
   AS_HELP_STRING([--with-smack], [build with SMACK support]),
   [], [with_smack=no]

diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 7a17d7689f4ffdae49c6482eadeb3cdfc2042019..d0bc8d80653c3d5fbec13bb8ee1a5c8941760d25 100644 (file)
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -151,6 +151,7 @@ if HAVE_SYSTEMD
 uuidd_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_DAEMON_LIBS)
 uuidd_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS)
 tmpfiles_DATA += misc-utils/uuidd-tmpfiles.conf
+sysusers_DATA += misc-utils/uuidd-sysusers.conf
 systemdsystemunit_DATA += \
        misc-utils/uuidd.service \
        misc-utils/uuidd.socket
@@ -166,7 +167,8 @@ PATHFILES += \
        misc-utils/uuidd.rc \
        misc-utils/uuidd.service \
        misc-utils/uuidd.socket \
-       misc-utils/uuidd-tmpfiles.conf
+       misc-utils/uuidd-tmpfiles.conf \
+       misc-utils/uuidd-sysusers.conf
 
 if BUILD_BLKID
 sbin_PROGRAMS += blkid