uuidd: use configured run state directory in manual etc

[kzak@redhat.com: - minor clean up in configure.in]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>

6 files changed, 15 insertions, 176 deletions

diff --git a/configure.ac b/configure.ac
index a86d42e53..cf62d64b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,7 @@ case $prefix:$localstatedir in
     localstatedir=${prefix}/${localstatedir}
     ;;
 esac
+AC_SUBST([localstatedir])
 
 libdirname=`basename "$libdir"`
 AC_SUBST([libdirname])
@@ -1315,6 +1316,7 @@ LIBS=""
 
 AC_CONFIG_HEADERS(config.h)
 
+
 AC_CONFIG_FILES([
 Makefile
 libblkid/blkid.pc
@@ -1326,7 +1328,10 @@ libmount/docs/version.xml
 libmount/mount.pc
 libmount/src/libmount.h
 libuuid/uuid.pc
+misc-utils/uuidd.8
+misc-utils/uuidd.rc
 misc-utils/uuidd.service
+misc-utils/uuidd.socket
 po/Makefile.in
 tests/commands.sh
 ])
diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore
index 37a47906c..db148ba74 100644
--- a/misc-utils/.gitignore
+++ b/misc-utils/.gitignore
@@ -1 +1,4 @@
+uuidd.8
+uuidd.rc
 uuidd.service
+uuidd.socket
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 06f37b26f..75b2e90b5 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -108,11 +108,15 @@ endif
 endif # BUILD_UUIDD
 
 EXTRA_DIST += \
-	misc-utils/uuidd.rc \
+	misc-utils/uuidd.8.in \
+	misc-utils/uuidd.rc.in \
 	misc-utils/uuidd.service.in \
+	misc-utils/uuidd.socket.in
+CLEANFILES += \
+	misc-utils/uuidd.8 \
+	misc-utils/uuidd.rc \
+	misc-utils/uuidd.service \
 	misc-utils/uuidd.socket
-CLEANFILES += misc-utils/uuidd.service
-
 
 if BUILD_LIBBLKID
 sbin_PROGRAMS += blkid
diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
deleted file mode 100644
index 90763f7a5..000000000
--- a/misc-utils/uuidd.8
+++ /dev/null
@@ -1,94 +0,0 @@
-.\" -*- nroff -*-
-.\" Copyright 2007 by Theodore Ts'o.  All Rights Reserved.
-.\" This file may be copied under the terms of the GNU Public License.
-.\"
-.TH UUIDD 8 "June 2011" "util-linux" "System Administration"
-.SH NAME
-uuidd \- UUID generation daemon
-.SH SYNOPSIS
-.B uuidd
-.RI [ options ]
-.SH DESCRIPTION
-The
-.B uuidd
-daemon is used by the UUID library to generate
-universally unique identifiers (UUIDs), especially time-based UUIDs,
-in a secure and guaranteed-unique fashion, even in the face of large
-numbers of threads running on different CPUs trying to grab UUIDs.
-.SH OPTIONS
-.TP
-.B \-d
-Run uuidd in debugging mode.  This prevents uuidd from running as a daemon.
-.TP
-.BR \-h , " \-\-help "
-Display help screen and exit.
-.TP
-.BR \-k , " \-\-kill "
-If currently a uuidd daemon is running, kill it.
-.TP
-.BR \-n , " \-\-uuids " \fInumber\fR
-When issuing a test request to a running uuidd, request a bulk response
-of
-.I number
-UUIDs.
-.TP
-.BR \-p , " \-\-pid " \fIpath\fR
-Specify the pathname where the pid file should be written.  By default,
-the pid file is written to /var/run/uuidd/uuidd.pid.
-.TP
-.BR \-P , " \-\-no-pid "
-Do not create pid file.
-.TP
-.BR \-F , " \-\-no-fork "
-Do not daemonize using double-fork.
-.TP
-.BR \-S , " \-\-socket-activation "
-Do not create the socket and instead expect it to be provided by the calling
-process.  Implies --no-fork and --no-pid.  As of this writing, this option is
-supposed to be used only with systemd.  This option must be enabled with a configure
-option.
-.TP
-.B \-q
-Suppress some failure messages.
-.TP
-.BR \-r , " \-\-random "
-Test uuidd by trying to connect to a running uuidd daemon and
-request it to return a random-based UUID.
-.TP
-.BR \-s , " \-\-socket " \fIpath\fR
-Specify the pathname used for the unix-domain socket used by uuidd.  By
-default, the pathname used is /var/run/uuidd/request.  This is primarily
-for debugging purposes, since the pathname is hard-coded in the libuuid
-library.
-.TP
-.BR \-T , " \-\-timeout " \fItimeout\fR
-Specify a timeout for uuidd.  If specified, then uuidd will exit after
-.I timeout
-seconds of inactivity.
-.TP
-.BR \-t , " \-\-time "
-Test uuidd by trying to connect to a running uuidd daemon and
-request it to return a time-based UUID.
-.TP
-.BR \-V , " \-\-version "
-Output version information and exit.
-.SH EXAMPLE
-Start up a daemon, print 42 random keys, and then stop the daemon.
-.PP
-.RS
-.nf
-uuidd -p /tmp/uuidd.pid -s /tmp/uuidd.socket
-uuidd -d -r -n 42 -s /tmp/uuidd.socket
-uuidd -d -k -s /tmp/uuidd.socket
-.nf
-.RE
-.SH AUTHOR
-The
-.B uuidd
-daemon was written by Theodore Ts'o <tytso@mit.edu>.
-.SH AVAILABILITY
-The uuidd daemon is part of the util-linux package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
-.SH "SEE ALSO"
-.BR uuid (3),
-.BR uuidgen (1)
diff --git a/misc-utils/uuidd.rc b/misc-utils/uuidd.rc
deleted file mode 100644
index d10fced4a..000000000
--- a/misc-utils/uuidd.rc
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /bin/sh -e
-### BEGIN INIT INFO
-# Provides:          uuidd
-# Required-Start:    $time $local_fs
-# Required-Stop:     $time $local_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: uuidd daemon
-# Description:       Init script for the uuid generation daemon
-### END INIT INFO
-#
-# Author:	"Theodore Ts'o" <tytso@mit.edu>
-#
-set -e
-
-# libuuid is able to execute the uuid daemon on-demand -- in such a case
-# the daemon binary must be setuid to an unprivileged user (e.g. uuidd:uuidd).
-#                                                    [-- kzak Jun 2009]
-UUIDD_ON_DEMAND_ONLY="no"
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/usr/sbin/uuidd
-UUIDD_USER=uuidd
-UUIDD_GROUP=uuidd
-UUIDD_DIR=/var/run/uuidd
-PIDFILE=$UUIDD_DIR/uuidd.pid
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-case "$1" in
-  start)
-	log_daemon_msg "Starting uuid generator" "uuidd"
-	if ! test -d $UUIDD_DIR; then
-		mkdir -p $UUIDD_DIR
-		chown -R $UUIDD_USER:$UUIDD_GROUP $UUIDD_DIR
-	fi
-	if test "$UUIDD_ON_DEMAND_ONLY" = yes; then
-		echo -n "(on demand only)"
-	else
-		start_daemon -p $PIDFILE $DAEMON
-	fi
-	log_end_msg $?
-    ;;
-  stop)
-	log_daemon_msg "Stopping uuidd generator" "uuidd"
-	killproc -p $PIDFILE $DAEMON
-	log_end_msg $?
-    ;;
-  status)
-	if pidofproc -p $PIDFILE $DAEMON >/dev/null 2>&1; then
-	    echo "$DAEMON is running";
-	    exit 0;
-	else
-	    echo "$DAEMON is NOT running";
-	    if test -f $PIDFILE; then exit 2; fi
-	    exit 3;
-	fi
-    ;;
-  force-reload|restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "Usage: /etc/init.d/uuidd {start|stop|restart|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/misc-utils/uuidd.socket b/misc-utils/uuidd.socket
deleted file mode 100644
index 4eba789fb..000000000
--- a/misc-utils/uuidd.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=UUID daemon activation socket
-
-[Socket]
-ListenStream=/var/run/uuidd/request
-
-[Install]
-WantedBy=sockets.target