diff --git a/nfs-utils-1.1.2-smnotifypath.patch b/nfs-utils-1.1.0-smnotify-path.patch similarity index 63% rename from nfs-utils-1.1.2-smnotifypath.patch rename to nfs-utils-1.1.0-smnotify-path.patch index 2a7f027..c5ca70f 100644 --- a/nfs-utils-1.1.2-smnotifypath.patch +++ b/nfs-utils-1.1.0-smnotify-path.patch @@ -1,24 +1,37 @@ -diff -up nfs-utils-1.1.2/utils/statd/sm-notify.c.orig nfs-utils-1.1.2/utils/statd/sm-notify.c ---- nfs-utils-1.1.2/utils/statd/sm-notify.c.orig 2008-03-14 11:46:29.000000000 -0400 -+++ nfs-utils-1.1.2/utils/statd/sm-notify.c 2008-07-02 18:34:24.000000000 -0400 -@@ -24,11 +24,12 @@ +commit 02968aa55972b680fa00273188da281d7612ca3e +Author: Steve Dickson +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 + +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 #include +#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 ++# define BASEDIR "/var/lib/nfs" "/" STATD_PATH_XTN # endif #endif -diff -up nfs-utils-1.1.2/utils/statd/sm-notify.man.orig nfs-utils-1.1.2/utils/statd/sm-notify.man ---- nfs-utils-1.1.2/utils/statd/sm-notify.man.orig 2008-03-14 11:46:29.000000000 -0400 -+++ nfs-utils-1.1.2/utils/statd/sm-notify.man 2008-07-02 18:34:13.000000000 -0400 +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 diff --git a/nfs-utils.spec b/nfs-utils.spec index 8d67363..5b362a7 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -31,7 +31,7 @@ Patch05: nfs-utils-1.1.0-exportfs-open.patch Patch06: nfs-utils-1.1.0-exportfs-man-update.patch 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-smnotifypath.patch +Patch09: nfs-utils-1.1.0-smnotify-path.patch Patch101: nfs-utils-1.1.2-tcpwrapper-fix.patch Patch102: nfs-utils-1.1.2-mount-retry.patch