rpms/nfs-utils/devel nfs-utils.spec, 1.64, 1.65 nfslock.init, 1.10, 1.11

[fedora-cvs-commits at redhat.com]

Author: steved

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

Modified Files:
	nfs-utils.spec nfslock.init 
Log Message:
The nfslock init script no longer needs to bring lockd down. (bz 162446)




Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- nfs-utils.spec	24 Aug 2005 21:52:55 -0000	1.64
+++ nfs-utils.spec	6 Sep 2005 12:53:41 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.7
-Release: 15
+Release: 16
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -257,6 +257,10 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Tue Sep  6 2005 Steve Dickson <SteveD at RedHat.com> 1.0.7-16
+- The nfslock init script no longer needs to bring lockd
+  down. (bz 162446)
+
 * Wed Aug 24 2005 Peter Jones <pjones at redhat.com> - 1.0.7-15
 - don't strip during "make install", so debuginfo packages are generated right
 


Index: nfslock.init
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfslock.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nfslock.init	13 Apr 2005 14:27:40 -0000	1.10
+++ nfslock.init	6 Sep 2005 12:53:41 -0000	1.11
@@ -77,8 +77,6 @@
 	echo -n $"Stopping NFS locking: "
 	if [ "$USERLAND_LOCKD" ]; then
 	   killproc lockd
-	else
-	   killproc lockd -KILL
 	fi
 	echo
 	echo -n $"Stopping NFS statd: "