diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | misc-utils/.gitignore | 1 | ||||
| -rw-r--r-- | misc-utils/Makefile.am | 11 | ||||
| -rw-r--r-- | misc-utils/uuidd.service.in | 9 | ||||
| -rw-r--r-- | misc-utils/uuidd.socket | 8 |
6 files changed, 40 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 6fec32db8..12e110336 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,7 +89,8 @@ checkxalloc: ENABLE_ALL = --enable-static-programs --enable-most-builds DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-use-tty-group \ - --disable-silent-rules $(ENABLE_ALL) + --disable-silent-rules $(ENABLE_ALL) \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) BUILT_SOURCES = .version diff --git a/configure.ac b/configure.ac index 8b80f388f..a1b1e9b7f 100644 --- a/configure.ac +++ b/configure.ac @@ -1142,6 +1142,16 @@ if test "x$enable_socket_activation" = xyes; then AC_DEFINE(USE_SOCKET_ACTIVATION, 1, [Should uuidd support socket activation?]) fi +AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [directory for systemd service files]), + [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) + +if test "x$with_systemdsystemunitdir" != "xno"; then + AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) +fi + +AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != "xno" ]) + AC_ARG_ENABLE([login-stat-mail], AS_HELP_STRING([--enable-login-stat-mail], [let login stat() the mailbox]), @@ -1265,6 +1275,7 @@ libuuid/uuid.pc login-utils/Makefile man/ru/Makefile misc-utils/Makefile +misc-utils/uuidd.service mount/Makefile partx/Makefile po/Makefile.in diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore index 927af2326..3fe556773 100644 --- a/misc-utils/.gitignore +++ b/misc-utils/.gitignore @@ -18,3 +18,4 @@ wipefs findmnt lsblk lslocks +uuidd.service diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 47a639baa..9dd358365 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = uuidd.rc - bin_PROGRAMS = sbin_PROGRAMS = usrsbin_exec_PROGRAMS = @@ -89,8 +87,17 @@ if USE_SOCKET_ACTIVATION uuidd_SOURCES += sd-daemon.c uuidd_LDADD += -lrt endif +if WITH_SYSTEMD +systemdsystemunit_DATA = \ + uuidd.service \ + uuidd.socket +endif endif +EXTRA_DIST = uuidd.rc uuidd.service.in uuidd.socket +CLEANFILES += uuidd.service + + if BUILD_LIBBLKID sbin_PROGRAMS += blkid findfs wipefs dist_man_MANS += blkid.8 findfs.8 wipefs.8 diff --git a/misc-utils/uuidd.service.in b/misc-utils/uuidd.service.in new file mode 100644 index 000000000..750fc31bf --- /dev/null +++ b/misc-utils/uuidd.service.in @@ -0,0 +1,9 @@ +[Unit] +Description=Daemon for generating UUIDs +Requires=uuidd.socket + +[Service] +ExecStart=@sbindir@/uuidd -S -T 60 +Restart=no +User=uuidd +Group=uuidd diff --git a/misc-utils/uuidd.socket b/misc-utils/uuidd.socket new file mode 100644 index 000000000..4eba789fb --- /dev/null +++ b/misc-utils/uuidd.socket @@ -0,0 +1,8 @@ +[Unit] +Description=UUID daemon activation socket + +[Socket] +ListenStream=/var/run/uuidd/request + +[Install] +WantedBy=sockets.target |