From 5816d0e42782d30a167293be5273d3f7df184983 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 09:19:31 +0000
Subject: [PATCH] auto-import nfs-utils-1.0.1-2.9 from
 nfs-utils-1.0.1-2.9.src.rpm

---
 nfs-utils.spec | 11 ++++++++++-
 nfslock.init   |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index e232898..4c52ed1 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.1
-Release: 2.6
+Release: 2.9
 Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.1.tar.gz
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 Source10: nfs.init
@@ -136,6 +136,15 @@ fi
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Thu Jan 23 2003 Tim Powers <timp@redhat.com> 1.0.1-2.9
+- rebuild
+
+* Fri Dec 13 2002 Daniel J Walsh <dwalsh@redhat.com>
+- change init script to not start rpc.lock if already running
+
+* Wed Dec 11 2002 Daniel J Walsh <dwalsh@redhat.com>
+- Moved access code to be after dropping privs
+
 * Mon Nov 18 2002 Stephen C. Tweedie <sct@redhat.com>
 - Build with %configure
 - Add nhfsgraph, nhfsnums and nhfsrun to the files list
diff --git a/nfslock.init b/nfslock.init
index 907f2ce..2e84949 100755
--- a/nfslock.init
+++ b/nfslock.init
@@ -43,6 +43,7 @@ fi
 RETVAL=0
 
 start() {
+    if [ ! -f /var/lock/subsys/nfslock ]; then
 	# Start daemons.
 	if [ "$USERLAND_LOCKD" ]; then
 	  echo -n $"Starting NFS locking: "
@@ -54,7 +55,8 @@ start() {
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
-	return $RETVAL
+    fi
+    return $RETVAL
 }
 
 stop() {