From 68e592b2376aa64224d654a20aa39d6c7788726c Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Tue, 6 Sep 2005 12:53:41 +0000
Subject: [PATCH] The nfslock init script no longer needs to bring lockd down.
 (bz 162446)

---
 nfs-utils.spec | 6 +++++-
 nfslock.init   | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index aebc800..fe5cf88 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -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 @@ fi
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Tue Sep  6 2005 Steve Dickson <SteveD@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@redhat.com> - 1.0.7-15
 - don't strip during "make install", so debuginfo packages are generated right
 
diff --git a/nfslock.init b/nfslock.init
index f9798d5..9284cbb 100755
--- a/nfslock.init
+++ b/nfslock.init
@@ -77,8 +77,6 @@ stop() {
 	echo -n $"Stopping NFS locking: "
 	if [ "$USERLAND_LOCKD" ]; then
 	   killproc lockd
-	else
-	   killproc lockd -KILL
 	fi
 	echo
 	echo -n $"Stopping NFS statd: "