[PATCH 1/2] uuidd.rc: drop on-demand mode from script

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxx>
---
 misc-utils/uuidd.rc.in | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/misc-utils/uuidd.rc.in b/misc-utils/uuidd.rc.in
index 27b75c6..3c5528a 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)
-- 
2.0.0

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux