X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=nfs-utils-statdpath.patch;h=0ba3cad025e7921a70ea26e42e610a558ffe7eb5;hb=ed65487133d337feac5bb3b601fabc9dc52154cb;hp=8503d56f3ca4e64c0d8f3e6ad63421d02ba54e9f;hpb=b3a564c688fa53a0e08fa48effa3cea840b59a26;p=packages%2Fnfs-utils.git

diff --git a/nfs-utils-statdpath.patch b/nfs-utils-statdpath.patch
index 8503d56..0ba3cad 100644
--- a/nfs-utils-statdpath.patch
+++ b/nfs-utils-statdpath.patch
@@ -1,51 +1,69 @@
---- ./utils/statd/statd.h.orig	2002-09-01 22:31:23.000000000 -0400
-+++ ./utils/statd/statd.h	2003-07-21 10:45:54.000000000 -0400
-@@ -13,10 +13,11 @@
- /*
-  * Paths and filenames.
-  */
-+#define STATD_PATH_XTN "statd/"
- #if defined(NFS_STATEDIR)
--# define DEFAULT_DIR_BASE	NFS_STATEDIR "/"
-+# define DEFAULT_DIR_BASE	NFS_STATEDIR "/" STATD_PATH_XTN
- #else
--# define DEFAULT_DIR_BASE	"/var/lib/nfs/"
-+# define DEFAULT_DIR_BASE	"/var/lib/nfs/" STATD_PATH_XTN
- #endif
+--- nfs-utils-1.1.4/Makefile.am~	2009-03-05 12:29:46.000000000 +0100
++++ nfs-utils-1.1.4/Makefile.am	2009-03-05 12:44:46.000000000 +0100
+@@ -54,8 +54,8 @@
+ 	touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab
+ 	touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab
+ 	touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab
+-	mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
+-	touch $(DESTDIR)$(statedir)/state
++	mkdir -p $(DESTDIR)$(statedir)/statd/sm $(DESTDIR)$(statedir)/statd/sm.bak
++	touch $(DESTDIR)$(statedir)/statd/state
  
- #define DEFAULT_SM_DIR		DEFAULT_DIR_BASE "sm"
---- ./utils/statd/statd.man.orig	2002-09-16 15:23:03.000000000 -0400
-+++ ./utils/statd/statd.man	2003-06-02 15:01:41.000000000 -0400
-@@ -23,7 +23,7 @@ reboots.
- For each NFS client or server machine to be monitored,
+ uninstall-hook:
+ 	rm $(DESTDIR)$(statedir)/xtab
+--- nfs-utils-1.2.2/utils/statd/statd.man~	2010-02-18 13:35:00.000000000 +0100
++++ nfs-utils-1.2.2/utils/statd/statd.man	2010-02-24 17:30:05.097124679 +0100
+@@ -232,7 +232,7 @@
+ If this option is not specified,
  .B rpc.statd
- creates a file in
--.BR /var/lib/nfs/sm .
-+.BR /var/lib/nfs/statd/sm .
- When starting, it normally runs
+ uses
+-.I /var/lib/nfs
++.I /var/lib/nfs/statd
+ by default.
+ .IP
+ After starting,
+@@ -365,13 +365,13 @@
+ will operate.
+ .SH FILES
+ .TP 2.5i
+-.I /var/lib/nfs/sm
++.I /var/lib/nfs/statd/sm
+ directory containing monitor list
+ .TP 2.5i
+-.I /var/lib/nfs/sm.bak
++.I /var/lib/nfs/statd/sm.bak
+ directory containing notify list
+ .TP 2.5i
+-.I /var/lib/nfs/state
++.I /var/lib/nfs/statd/state
+ NSM state number for this host
+ .TP 2.5i
+ .I /var/run/run.statd.pid
+--- nfs-utils-1.2.2/utils/statd/sm-notify.man~	2010-02-18 13:35:00.000000000 +0100
++++ nfs-utils-1.2.2/utils/statd/sm-notify.man	2010-02-24 17:30:27.917124808 +0100
+@@ -186,7 +186,7 @@
+ If this option is not specified,
  .B sm-notify
- to iterate through these files and notify the
-@@ -95,7 +95,7 @@ and
- .BI "\-P," "" " \-\-state\-directory\-path "  directory
- specify a directory in which to place statd state information.
- If this option is not specified the default of 
--.BR /var/lib/nfs
-+.BR /var/lib/nfs/statd
- is used.
- .TP
- .B -N
-@@ -136,11 +136,11 @@ and
- manual pages.
- 
+ uses
+-.I /var/lib/nfs
++.I /var/lib/nfs/statd
+ by default.
+ .IP
+ After starting,
+@@ -287,13 +287,13 @@
+ command supports sending notification only via datagram transport protocols.
  .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/*
- .SH SEE ALSO
- .BR rpc.nfsd(8),
- .BR portmap(8)
+ .TP 2.5i
+-.I /var/lib/nfs/sm
++.I /var/lib/nfs/statd/sm
+ directory containing monitor list
+ .TP 2.5i
+-.I /var/lib/nfs/sm.bak
++.I /var/lib/nfs/statd/sm.bak
+ directory containing notify list
+ .TP 2.5i
+-.I /var/lib/nfs/state
++.I /var/lib/nfs/statd/state
+ NSM state number for this host
+ .TP 2.5i
+ .I /proc/sys/fs/nfs/nsm_local_state