From 557c859d20af8fcf39ca07cbfd70f8404f1fd3a3 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Sep 17 2007 16:55:03 +0000
Subject: Updated exportfs manpage (bz 262861)


---

diff --git a/nfs-utils-1.1.0-exportfs-man-update.patch b/nfs-utils-1.1.0-exportfs-man-update.patch
new file mode 100644
index 0000000..90f214d
--- /dev/null
+++ b/nfs-utils-1.1.0-exportfs-man-update.patch
@@ -0,0 +1,103 @@
+commit 0647ed30739b9867a4657bd69467925c868640b3
+Author: Steve Dickson <steved@redhat.com>
+Date:   Fri Sep 14 13:21:08 2007 -0400
+
+    Updated exportfs man to talk about /var/lib/nfs/etab
+    instead of /var/lib/nfs/xtab
+    
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff --git a/utils/exportfs/exportfs.man b/utils/exportfs/exportfs.man
+index 2bd8e31..9cfe7b8 100644
+--- a/utils/exportfs/exportfs.man
++++ b/utils/exportfs/exportfs.man
+@@ -22,14 +22,14 @@ The
+ .B exportfs
+ command is used to maintain the current table of exported file systems for
+ NFS. This list is kept in a separate file named
+-.BR /var/lib/nfs/xtab
++.BR /var/lib/nfs/etab
+ which is read by
+ .B mountd
+ when a remote host requests access to mount a file tree, and parts of
+ the list which are active are kept in the kernel's export table.
+ .P
+ Normally this 
+-.B xtab
++.B etab
+ file is initialized with the list of all file systems named in
+ .B /etc/exports 
+ by invoking
+@@ -59,7 +59,7 @@ In the new mode,
+ does not give any information to the kernel but only provides it to
+ .B mountd
+ through the
+-.B /var/lib/nfs/xtab
++.B /var/lib/nfs/etab
+ file.
+ .B mountd
+ will listen to requests from the kernel and will provide information
+@@ -69,7 +69,7 @@ In the legacy mode,
+ any export requests which identify a specific host (rather than a
+ subnet or netgroup etc) are entered directly into the kernel's export
+ table as well as being written to
+-.BR /var/lib/nfs/xtab .
++.BR /var/lib/nfs/etab .
+ Further, any mount points listed in
+ .B /var/lib/nfs/rmtab
+ which match a non host-specific export request will cause an
+@@ -93,8 +93,8 @@ file, so that only default options and options given on the command
+ line are used.
+ .TP
+ .B -r
+-Reexport all directories. It synchronizes /var/lib/nfs/xtab
+-with /etc/exports. It removes entries in /var/lib/nfs/xtab
++Reexport all directories. It synchronizes /var/lib/nfs/etab
++with /etc/exports. It removes entries in /var/lib/nfs/etab
+ which are deleted from /etc/exports, and remove any entries from the
+ kernel export table which are no longer valid.
+ .TP
+@@ -120,7 +120,7 @@ entries to the export table.  When using
+ all directories in
+ .B exports(5)
+ are added to
+-.B xtab
++.B etab
+ and the resulting list is pushed into the kernel.
+ .P
+ The
+@@ -152,7 +152,7 @@ directory.
+ Modifications of the kernel export table used by
+ .B nfsd(8)
+ take place immediately after parsing the command line and updating the
+-.B xtab
++.B etab
+ file.
+ .P
+ The default export options are
+@@ -163,14 +163,14 @@ The third synopsis shows how to unexported a currently exported directory.
+ When using
+ .BR "exportfs -ua" ,
+ all entries listed in
+-.B xtab
++.B etab
+ are removed from the kernel export tables, and the file is cleared. This
+ effectively shuts down all NFS activity.
+ .P
+ To remove individual export entries, one can specify a
+ .I host:/path
+ pair. This deletes the specified entry from
+-.B xtab
++.B etab
+ and removes the corresponding kernel entry (if any).
+ .P
+ .\" -------------------- Dumping the Export Table -----------------
+@@ -186,7 +186,7 @@ option, the list of flags pertaining to each export are shown in addition.
+ The following adds all directories listed in
+ .B /etc/exports
+ to
+-.B /var/lib/nfs/xtab
++.B /var/lib/nfs/etab
+ and pushes the resulting export entries into the kernel:
+ .P
+ .nf
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 7b96cd8..c68246e 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -34,6 +34,7 @@ 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-exportfs-open.patch
 Patch11: nfs-utils-1.1.0-smnotify-path.patch
+Patch12: nfs-utils-1.1.0-exportfs-man-update.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -98,6 +99,7 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch09 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -271,6 +273,7 @@ fi
 * Fri Sep 14 2007 Steve Dickson <steved@redhat.com>  1.1.0-5
 - Changed the default paths in sm-notify to 
   /var/lib/nfs/statd (bz 258461)
+- Updated exportfs manpage (bz 262861)
 
 * Wed Aug 15 2007 Steve Dickson <steved@redhat.com>  1.1.0-4
 - Make sure the open() system calling in exportfs uses