From 4797294ba94c4442544ff7450f38c4f3b8de118c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sat, 31 Mar 2007 20:54:12 +0000
Subject: [PATCH] - subsys lock consistency the proper way

Changed files:
    nfs-utils-subsys.patch -> 1.1
    rpcgssd.init -> 1.3
    rpcidmapd.init -> 1.4
---
 nfs-utils-subsys.patch | 20 ++++++++++++++++++++
 rpcgssd.init           |  8 ++++----
 rpcidmapd.init         |  8 ++++----
 3 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 nfs-utils-subsys.patch

diff --git a/nfs-utils-subsys.patch b/nfs-utils-subsys.patch
new file mode 100644
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 b0568f0..a87ae1a 100644
--- 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 e356e3e..c117b3b 100644
--- 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
-- 
2.44.0