- subsys lock consistency the proper way

Changed files:
    nfs-utils-subsys.patch -> 1.1
    rpcgssd.init -> 1.3
    rpcidmapd.init -> 1.4

diff --git a/nfs-utils-subsys.patch b/nfs-utils-subsys.patch
new file mode 100644 (file)
index 0000000..8a22508
--- /dev/null
+++ b/nfs-utils-subsys.patch
@@ -0,0 +1,20 @@
+--- nfs-utils-1.0.12/utils/mount/nfs4mount.c~  2007-03-31 22:46:53.438974675 +0200
++++ nfs-utils-1.0.12/utils/mount/nfs4mount.c   2007-03-31 22:52:34.162391396 +0200
+@@ -52,7 +52,7 @@
+ extern int verbose;
+ extern int sloppy;
+ 
+-char *IDMAPLCK = DEFAULT_DIR "/rpcidmapd";
++char *IDMAPLCK = DEFAULT_DIR "/idmapd";
+ #define idmapd_check() do { \
+       if (access(IDMAPLCK, F_OK)) { \
+               printf(_("Warning: rpc.idmapd appears not to be running.\n" \
+@@ -60,7 +60,7 @@
+       } \
+ } while(0);
+ 
+-char *GSSDLCK = DEFAULT_DIR "/rpcgssd";
++char *GSSDLCK = DEFAULT_DIR "/gssd";
+ #define gssd_check() do { \
+               if (access(GSSDLCK, F_OK)) { \
+                       printf(_("Warning: rpc.gssd appears not to be running.\n")); \

diff --git a/rpcgssd.init b/rpcgssd.init
index b0568f071d527e174d9dcc403b9e11c758227247..a87ae1a5113e6cb08bc7ed5a41dae192ffa888a4 100644 (file)
--- a/rpcgssd.init
+++ b/rpcgssd.init
@@ -45,7 +45,7 @@ RETVAL=0
 case "$1" in
   start)
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/rpcgssd ]; then
+       if [ ! -f /var/lock/subsys/gssd ]; then
                if ! grep -q rpc_pipefs /proc/mounts ; then
                        modprobe -s sunrpc >/dev/null 2>&1
                        run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" \
@@ -58,16 +58,16 @@ case "$1" in
                msg_starting "RPC gssd"
                daemon rpc.gssd $RPCGSSOPTIONS
                RETVAL=$?
-               [ $RETVAL = 0 ] && touch /var/lock/subsys/rpcgssd
+               [ $RETVAL = 0 ] && touch /var/lock/subsys/gssd
        else
                msg_already_running "RPC gssd"
        fi
        ;;
   stop)
-       if [ -f /var/lock/subsys/rpcgssd ]; then
+       if [ -f /var/lock/subsys/gssd ]; then
                msg_stopping "RPC gssd"
                killproc rpc.gssd
-               rm -f /var/lock/subsys/rpcgssd
+               rm -f /var/lock/subsys/gssd
        else
                msg_not_running "RPC gssd"
        fi

diff --git a/rpcidmapd.init b/rpcidmapd.init
index e356e3e3a36369e3c17c2370fec4b341491b1747..c117b3b3c886141661ab99c66d6ec30902674818 100644 (file)
--- a/rpcidmapd.init
+++ b/rpcidmapd.init
@@ -41,7 +41,7 @@ RETVAL=0
 case "$1" in
   start)
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/rpcidmapd ]; then
+       if [ ! -f /var/lock/subsys/idmapd ]; then
                if ! grep -q rpc_pipefs /proc/mounts ; then
                        modprobe -s sunrpc >/dev/null 2>&1
                        run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" \
@@ -51,16 +51,16 @@ case "$1" in
                msg_starting "RPC idmapd"
                daemon rpc.idmapd $RPCIDMAPOPTIONS
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpcidmapd
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/idmapd
        else
                msg_already_running "RPC idmapd"
        fi
        ;;
   stop)
-       if [ -f /var/lock/subsys/rpcidmapd ]; then
+       if [ -f /var/lock/subsys/idmapd ]; then
                msg_stopping "RPC idmapd"
                killproc rpc.idmapd
-               rm -f /var/lock/subsys/rpcidmapd
+               rm -f /var/lock/subsys/idmapd
        else
                msg_not_running "RPC idmapd"
        fi