rpms/nfs-utils/F-9 nfs-utils-1.1.0-smnotify-path.patch, 1.2, 1.3 nfs-utils.spec, 1.172, 1.173

[Steve Dickson (steved)]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7408

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.0-smnotify-path.patch 
Log Message:
- Changed the default directories for sm-notify (bz 435480)
- Removed the nfslock service start/stop from %%post section 
  (bz 453046)


nfs-utils-1.1.0-smnotify-path.patch:

Index: nfs-utils-1.1.0-smnotify-path.patch
===================================================================
RCS file: nfs-utils-1.1.0-smnotify-path.patch
diff -N nfs-utils-1.1.0-smnotify-path.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nfs-utils-1.1.0-smnotify-path.patch	2 Jul 2008 23:48:54 -0000	1.3
@@ -0,0 +1,70 @@
+commit 02968aa55972b680fa00273188da281d7612ca3e
+Author: Steve Dickson <steved at redhat.com>
+Date:   Fri Sep 14 14:19:50 2007 -0400
+
+    Changed the default paths in sm-notify to
+    /var/lib/nfs/statd which is where the locking
+    state is kept in Red Hat distros.
+    
+    Signed-off-by: Steve Dickson <steved at redhat.com>
+
+diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
+index 98c03f9..862889f 100644
+--- a/utils/statd/sm-notify.c
++++ b/utils/statd/sm-notify.c
+@@ -24,11 +24,13 @@
+ #include <errno.h>
+ #include <grp.h>
+ 
++#define STATD_PATH_XTN "statd/"
++
+ #ifndef BASEDIR
+ # ifdef NFS_STATEDIR
+-#  define BASEDIR		NFS_STATEDIR
++#  define BASEDIR		NFS_STATEDIR "/" STATD_PATH_XTN
+ # else
+-#  define BASEDIR		"/var/lib/nfs"
++#  define BASEDIR		"/var/lib/nfs" "/" STATD_PATH_XTN
+ # endif
+ #endif
+ 
+diff --git a/utils/statd/sm-notify.man b/utils/statd/sm-notify.man
+index dd03b8d..69b7059 100644
+--- a/utils/statd/sm-notify.man
++++ b/utils/statd/sm-notify.man
+@@ -33,7 +33,7 @@ but this is configurable.
+ For each NFS client or server machine to be monitored,
+ .B rpc.statd
+ creates a file in
+-.BR /var/lib/nfs/sm ", "
++.BR /var/lib/nfs/statd/sm ", "
+ and removes the file if monitoring is no longer required.
+ .PP
+ When the machine is rebooted,
+@@ -47,7 +47,7 @@ Each machine has an
+ which is basically an integer counter that is incremented
+ each time the machine reboots. This counter is stored
+ in
+-.BR /var/lib/nfs/state ,
++.BR /var/lib/nfs/statd/state ,
+ and updated by
+ .BR sm-notify .
+ .SS Security
+@@ -149,13 +149,13 @@ By default,
+ .B sm-notify
+ forks and puts itself in the background after obtaining the
+ list of hosts from
+-.BR /var/lib/nfs/sm .
++.BR /var/lib/nfs/statd/sm .
+ .SH FILES
+-.BR /var/lib/nfs/state
++.BR /var/lib/nfs/statd/state
+ .br
+-.BR /var/lib/nfs/sm/*
++.BR /var/lib/nfs/statd/sm/*
+ .br
+-.BR /var/lib/nfs/sm.bak/*
++.BR /var/lib/nfs/statd/sm.bak/*
+ .br
+ .BR /var/run/sm-notify.pid
+ .SH SEE ALSO


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-9/nfs-utils.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- nfs-utils.spec	25 Jun 2008 12:38:28 -0000	1.172
+++ nfs-utils.spec	2 Jul 2008 23:48:54 -0000	1.173
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -32,6 +32,7 @@
 Patch07: nfs-utils-1.1.2-multi-auth-flavours.patch
 Patch08: nfs-utils-1.1.2-mount-eacces.patch
 Patch09: nfs-utils-1.1.2-rmtab-fqdn.patch
+Patch10: nfs-utils-1.1.0-smnotify-path.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -92,6 +93,7 @@
 %patch07 -p1
 %patch08 -p1
 %patch09 -p1
+%patch10 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -176,13 +178,7 @@
 /sbin/chkconfig --add rpcgssd
 /sbin/chkconfig --add rpcsvcgssd
 # Make sure statd used the correct uid/gid.
-if [ -f /var/lock/subsys/nfslock ]; then
-	/etc/rc.d/init.d/nfslock stop > /dev/null
-	chown -R rpcuser:rpcuser /var/lib/nfs/statd
-	/etc/rc.d/init.d/nfslock start > /dev/null
-else
-	chown -R rpcuser:rpcuser /var/lib/nfs/statd
-fi
+chown -R rpcuser:rpcuser /var/lib/nfs/statd
 
 %preun
 if [ "$1" = "0" ]; then
@@ -259,6 +255,11 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Wed Jul  2 2008 Steve Dickson <steved at redhat.com> 1.1.2-6
+- Changed the default directories for sm-notify (bz 435480)
+- Removed the nfslock service start/stop from %%post section 
+  (bz 453046)
+
 * Tue Jun 24 2008 Steve Dickson <steved at redhat.com>  1.1.2-5
 - FQDNs in the rmtab causes exportfs to seg fault (bz 444275)