rpms/nfs-utils/devel nfs-utils.spec, 1.78, 1.79 rpcgssd.init, 1.4, 1.5 rpcidmapd.init, 1.4, 1.5 rpcsvcgssd.init, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24517

Modified Files:
	nfs-utils.spec rpcgssd.init rpcidmapd.init rpcsvcgssd.init 
Log Message:
fix init scripts so rc will see to shut things down



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- nfs-utils.spec	9 Jan 2006 23:06:31 -0000	1.78
+++ nfs-utils.spec	11 Jan 2006 21:55:50 -0000	1.79
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8.rc2
-Release: 1.FC5
+Release: 2.FC5
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -216,7 +216,10 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
-* Mon Jan  9 2006 1.0.8-1
+* Wed Jan 11 2006 Peter Jones <pjones at redhat.com> 1.0.8.rc2-2.FC5
+- Fix lockfile naming in the initscripts so they're stopped correctly.
+
+* Mon Jan  9 2006 Steve Dickson <SteveD at RedHat.com> 1.0.8.rc2-1.FC5
 - Updated to 1.0.8-rc2 release
 - Broke out libgssapi into its own rpm
 - Move librpcsecgss and libnfsidmap in the new nfs-utils-lib rpm


Index: rpcgssd.init
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/rpcgssd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpcgssd.init	9 Jan 2006 20:17:59 -0000	1.4
+++ rpcgssd.init	11 Jan 2006 21:55:51 -0000	1.5
@@ -33,6 +33,7 @@
 # Try to use machine credentials by default
 OPTIONS=""
 RETVAL=0
+LOCKFILE=/var/lock/subsys/rpcgssd
 prog="rpc.gssd"
 
 case "$1" in
@@ -41,7 +42,7 @@
 	if status $prog > /dev/null ; then
 		exit 0
 	fi
-	rm -f /var/lock/subsys/$prog
+	rm -f $LOCKFILE
 
 	echo -n $"Starting RPC gssd: "
 
@@ -70,7 +71,7 @@
 	daemon $prog ${OPTIONS}
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.gssd
+	[ $RETVAL -eq 0 ] && touch $LOCKFILE
 	;;
   stop)
 	# Stop daemon.
@@ -78,7 +79,7 @@
 	killproc $prog
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.gssd
+	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
 	;;
   status)
 	status rpc.gssd
@@ -90,7 +91,7 @@
 	RETVAL=$?
 	;;
   condrestart)
-	if [ -f /var/lock/subsys/rpc.gssd ]; then
+	if [ -f $LOCKFILE ]; then
 		$0 restart
 		RETVAL=$?
 	fi


Index: rpcidmapd.init
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/rpcidmapd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpcidmapd.init	8 Sep 2005 14:27:06 -0000	1.4
+++ rpcidmapd.init	11 Jan 2006 21:55:51 -0000	1.5
@@ -24,6 +24,7 @@
 
 OPTIONS=""
 RETVAL=0
+LOCKFILE=/var/lock/subsys/rpcidmapd
 prog="rpc.idmapd"
 
 case "$1" in
@@ -33,7 +34,7 @@
 		killproc $prog "-SIGHUP" > /dev/null
 		exit 0
 	}
-	rm -f /var/lock/subsys/$prog
+	rm -f $LOCKFILE
 
 	echo -n $"Starting RPC idmapd: "
 
@@ -56,7 +57,7 @@
 	daemon $prog ${OPTIONS}
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.idmapd
+	[ $RETVAL -eq 0 ] && touch $LOCKFILE
 	;;
   stop)
 	# Stop daemon.
@@ -64,7 +65,7 @@
 	killproc $prog
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.idmapd
+	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
 	;;
   status)
 	status rpc.idmapd
@@ -76,7 +77,7 @@
 	RETVAL=$?
 	;;
   condrestart)
-	if [ -f /var/lock/subsys/rpc.idmapd ]; then
+	if [ -f $LOCKFILE ]; then
 		$0 restart
 		RETVAL=$?
 	fi


Index: rpcsvcgssd.init
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/rpcsvcgssd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpcsvcgssd.init	14 Feb 2005 19:29:31 -0000	1.3
+++ rpcsvcgssd.init	11 Jan 2006 21:55:51 -0000	1.4
@@ -31,6 +31,7 @@
 
 OPTIONS=""
 RETVAL=0
+LOCKFILE=/var/lock/subsys/rpcsvcgssd
 prog="rpc.svcgssd"
 
 case "$1" in
@@ -39,7 +40,7 @@
 	if status $prog > /dev/null ; then
 		exit 0
 	fi
-	rm -f /var/lock/subsys/$prog
+	rm -f $LOCKFILE
 
 	echo -n $"Starting RPC svcgssd: "
 
@@ -69,7 +70,7 @@
 	daemon $prog ${OPTIONS}
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.svcgssd
+	[ $RETVAL -eq 0 ] && touch $LOCKFILE
 	;;
   stop)
 	# Stop daemon.
@@ -77,7 +78,7 @@
 	killproc $prog
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.svcgssd
+	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
 	;;
   status)
 	status rpc.svcgssd
@@ -89,7 +90,7 @@
 	RETVAL=$?
 	;;
   condrestart)
-	if [ -f /var/lock/subsys/rpc.svcgssd ]; then
+	if [ -f $LOCKFILE ]; then
 		$0 restart
 		RETVAL=$?
 	fi