rpms/nfs-utils/F-7 nfs-utils-1.1.0-smnotify-path.patch, NONE, 1.1 nfs-utils.spec, 1.160, 1.161

[Steve Dickson (steved)]

Author: steved

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

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.0-smnotify-path.patch 
Log Message:
 Changed the default paths in sm-notify to /var/lib/nfs/statd (bz 258461)


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

--- NEW FILE nfs-utils-1.1.0-smnotify-path.patch ---
diff -up nfs-utils-1.1.0/utils/statd/sm-notify.c.orig nfs-utils-1.1.0/utils/statd/sm-notify.c
--- nfs-utils-1.1.0/utils/statd/sm-notify.c.orig	2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/statd/sm-notify.c	2007-09-14 13:54:28.000000000 -0400
@@ -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 -up nfs-utils-1.1.0/utils/statd/sm-notify.man.orig nfs-utils-1.1.0/utils/statd/sm-notify.man
--- nfs-utils-1.1.0/utils/statd/sm-notify.man.orig	2007-05-10 23:40:57.000000000 -0400
+++ nfs-utils-1.1.0/utils/statd/sm-notify.man	2007-09-14 14:01:36.000000000 -0400
@@ -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
diff -up nfs-utils-1.1.0/utils/exportfs/exportfs.man.orig nfs-utils-1.1.0/utils/exportfs/exportfs.man


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/F-7/nfs-utils.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- nfs-utils.spec	13 Aug 2007 15:21:04 -0000	1.160
+++ nfs-utils.spec	14 Sep 2007 18:13:54 -0000	1.161
@@ -2,7 +2,7 @@
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -32,6 +32,7 @@
 Patch07: nfs-utils-1.1.0-showmount-rpcerror.patch
 Patch08: nfs-utils-1.1.0-mount-v4-errors.patch
 Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
+Patch10: nfs-utils-1.1.0-smnotify-path.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -94,6 +95,7 @@
 %patch07 -p1
 %patch08 -p1
 %patch09 -p1
+%patch10 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -264,6 +266,9 @@
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Fri Sep 14 2007 Steve Dickson <steved at redhat.com>  1.1.0-4
+- Changed the default paths in sm-notify to /var/lib/nfs/statd (bz 258461)
+
 * Mon Aug 13 2007 Steve Dickson <steved at redhat.com>  1.1.0-3
 - Added nosharecache mount option which re-enables
   rw/ro mounts to the same server (bz 243913).