- Reworked the nfslock init script so if lockd is running it will be killed

which is what the HA community needs. (bz 162446)
- Stopped rpcidmapd.init from doing extra echoing when condstart-ed.

nfs-utils.spec

@@ -257,9 +257,11 @@ 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)
+* Tue Sep  8 2005 Steve Dickson <SteveD@RedHat.com> 1.0.7-16
+- Reworked the nfslock init script so if lockd is running
+  it will be killed which is what the HA community needs. (bz 162446)
+- Stopped rpcidmapd.init from doing extra echoing when
+  condstart-ed.
 
 * 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

nfslock.init

@@ -74,11 +74,11 @@ start() {
 
 stop() {
 	# Stop daemons.
+	if [ -n "`pidofproc lockd`" ]; then
 		echo -n $"Stopping NFS locking: "
-	if [ "$USERLAND_LOCKD" ]; then
-	   killproc lockd
-	fi
+		killproc lockd -KILL
 		echo
+	fi
 	echo -n $"Stopping NFS statd: "
 	killproc rpc.statd
 	RETVAL=0

rpcidmapd.init

@@ -29,10 +29,10 @@ prog="rpc.idmapd"
 case "$1" in
   start|condstart)
 	# Make sure the daemon is not already running.
-	if status $prog > /dev/null ; then
-		[ "$1" = "condstart" ] && killproc $prog "-SIGHUP"
+	[ "$1" = "condstart" -a -n "`pidofproc $prog`" ] && {
+		killproc $prog "-SIGHUP" > /dev/null
 		exit 0
-	fi
+	}
 	rm -f /var/lock/subsys/$prog
 
 	echo -n $"Starting RPC idmapd: "