From: Andreas Henriksson <andreas@fatal.se>
Date: Fri, 11 Jul 2014 13:08:40 +0000 (+0200)
Subject: uuidd.rc: drop on-demand mode from script
X-Git-Tag: v2.25~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=928601e6307479de6929ac8e1f1c90750111f0b4;p=thirdparty%2Futil-linux.git

uuidd.rc: drop on-demand mode from script

The on-demand mode was dropped from libuuid in
commit ea4f8845f0241c7 "libuuid: don't exec uuidd"

You now need systemd (socket activation) to use
uuidd on demand.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>
---

diff --git a/misc-utils/uuidd.rc.in b/misc-utils/uuidd.rc.in
index 27b75c68dc..3c5528a155 100644
--- a/misc-utils/uuidd.rc.in
+++ b/misc-utils/uuidd.rc.in
@@ -13,11 +13,6 @@
 #
 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
@@ -36,11 +31,7 @@ case "$1" in
 		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
+	start_daemon -p $PIDFILE $DAEMON
 	log_end_msg $?
     ;;
   stop)