]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
uuidd.rc: drop on-demand mode from script
authorAndreas Henriksson <andreas@fatal.se>
Fri, 11 Jul 2014 13:08:40 +0000 (15:08 +0200)
committerKarel Zak <kzak@redhat.com>
Mon, 14 Jul 2014 13:55:34 +0000 (15:55 +0200)
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>
misc-utils/uuidd.rc.in

index 27b75c68dc1ada2bbd4a791a36d2479ad44755aa..3c5528a1558091cfed9bee2a36182ae3703e50c7 100644 (file)
 #
 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)