SOURCES: nfs-utils-subsys.patch (NEW), rpcgssd.init, rpcidmapd.ini...

[baggins]

Author: baggins                      Date: Sat Mar 31 20:54:17 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- subsys lock consistency the proper way

---- Files affected:
SOURCES:
   nfs-utils-subsys.patch (NONE -> 1.1)  (NEW), rpcgssd.init (1.2 -> 1.3) , rpcidmapd.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/nfs-utils-subsys.patch
diff -u /dev/null SOURCES/nfs-utils-subsys.patch:1.1
--- /dev/null	Sat Mar 31 22:54:17 2007
+++ SOURCES/nfs-utils-subsys.patch	Sat Mar 31 22:54:12 2007
@@ -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")); \

================================================================
Index: SOURCES/rpcgssd.init
diff -u SOURCES/rpcgssd.init:1.2 SOURCES/rpcgssd.init:1.3
--- SOURCES/rpcgssd.init:1.2	Fri Mar 30 01:07:46 2007
+++ SOURCES/rpcgssd.init	Sat Mar 31 22:54:12 2007
@@ -45,7 +45,7 @@
 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 @@
 		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

================================================================
Index: SOURCES/rpcidmapd.init
diff -u SOURCES/rpcidmapd.init:1.3 SOURCES/rpcidmapd.init:1.4
--- SOURCES/rpcidmapd.init:1.3	Fri Mar 30 01:07:47 2007
+++ SOURCES/rpcidmapd.init	Sat Mar 31 22:54:12 2007
@@ -41,7 +41,7 @@
 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 @@
 		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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpcgssd.init?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/rpcidmapd.init?r1=1.3&r2=1.4&f=u