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

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

[Andreas Henriksson]

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 | 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

[PATCH 2/2] uuidd.rc: Requires remote_fs

[Andreas Henriksson]

The Debian package checking tool lintian thinks that the script is
missing Requires on $remote_fs because it pokes at stuff under /usr
and it's probably right.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>
---
 misc-utils/uuidd.rc.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc-utils/uuidd.rc.in b/misc-utils/uuidd.rc.in
index 3c5528a..cebe228 100644
--- a/misc-utils/uuidd.rc.in
+++ b/misc-utils/uuidd.rc.in
@@ -1,8 +1,8 @@
 #! /bin/sh -e
 ### BEGIN INIT INFO
 # Provides:          uuidd
-# Required-Start:    $time $local_fs
-# Required-Stop:     $time $local_fs
+# Required-Start:    $time $local_fs $remote_fs
+# Required-Stop:     $time $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: uuidd daemon
-- 
2.0.0

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

[Karel Zak]

On Fri, Jul 11, 2014 at 03:08:40PM +0200, Andreas Henriksson wrote:
>  misc-utils/uuidd.rc.in | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)

 Good catch! Applied, thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 2/2] uuidd.rc: Requires remote_fs

[Karel Zak]

On Fri, Jul 11, 2014 at 03:08:41PM +0200, Andreas Henriksson wrote:
>  misc-utils/uuidd.rc.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com