rpms/nfs-utils/devel nfs-utils.spec, 1.217, 1.218 nfs.init, 1.32, 1.33 nfslock.init, 1.23, 1.24

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19561

Modified Files:
	nfs-utils.spec nfs.init nfslock.init 
Log Message:
Fixed lockd not using settings in sysconfig/nfs (bz 461043)



Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- nfs-utils.spec	5 Mar 2009 12:57:02 -0000	1.217
+++ nfs-utils.spec	6 Mar 2009 12:31:05 -0000	1.218
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -241,6 +241,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Fri Mar  6 2009 Steve Dickson <steved at redhat.com> 1.1.5-2
+- Fixed lockd not using settings in sysconfig/nfs (bz 461043)
+
 * Thu Mar  5 2009 Steve Dickson <steved at redhat.com> 1.1.5-1
 - Updated to latest upstream version: 1.1.5
 


Index: nfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.init,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nfs.init	1 Dec 2008 14:19:25 -0000	1.32
+++ nfs.init	6 Mar 2009 12:31:05 -0000	1.33
@@ -55,21 +55,21 @@
 	# Start daemons.
 	[ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd start
 
+	# Set the ports lockd should listen on
+	if [ -n "$LOCKD_TCPPORT" -o -n "$LOCKD_UDPPORT" ]; then 
+		[ -x /sbin/modprobe ] && /sbin/modprobe lockd $LOCKDARG
+		[ -n "$LOCKD_TCPPORT" ] && \
+			/sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
+		[ -n "$LOCKD_UDPPORT" ] && \
+			/sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
+	fi
+
 	# Load the nfsd module so /proc/fs/nfsd will exist
 	[ "$NFSD_MODULE" != "noload" ] && {
 		[ -x /sbin/modprobe ] && /sbin/modprobe nfsd
 	}
-
 	action $"Starting NFS services: " /usr/sbin/exportfs -r
 
-	# Set the ports lockd should listen on
-	if [ -n "$LOCKD_TCPPORT" ]; then
-	    /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
-	fi
-	if [ -n "$LOCKD_UDPPORT" ]; then
-	    /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
-	fi
-
 	if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then
 	    echo -n $"Starting NFS quotas: "
 		[ -n "$RQUOTAD_PORT" ] \


Index: nfslock.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfslock.init,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nfslock.init	16 Sep 2008 20:29:11 -0000	1.23
+++ nfslock.init	6 Mar 2009 12:31:06 -0000	1.24
@@ -44,11 +44,13 @@
 	# See if the kernel lockd should start up 
 	# listening on a particular port
 	#
-	[ -n "$LOCKD_TCPPORT" ] && \
-		/sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
-	[ -n "$LOCKD_UDPPORT" ] && \
-		/sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
-	[ -n "$LOCKDARG" ]  && modprobe lockd $LOCKDARG
+	if [ -n "$LOCKD_TCPPORT" -o -n "$LOCKD_UDPPORT" ]; then 
+		[ -x /sbin/modprobe ] && /sbin/modprobe lockd $LOCKDARG
+		[ -n "$LOCKD_TCPPORT" ] && \
+			/sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
+		[ -n "$LOCKD_UDPPORT" ] && \
+			/sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
+	fi
 
 	echo -n $"Starting NFS statd: "
 	# Set statd's local hostname if defined