From: hjl <hjl>
Date: Thu, 10 Aug 2000 03:04:51 +0000 (+0000)
Subject: 2000-08-09  H.J. Lu <hjl@lucon.org>
X-Git-Tag: nfs-utils-0-2-pre1~9
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=da25e1aa006bafb4dd08e2ffedbd42d7c1f4036b;p=nfs-utils.git

2000-08-09  H.J. Lu <hjl@lucon.org>

	* etc/redhat/nfs.init: Run /usr/sbin/exportfs first during
	startup to ensure all existing clients work fine.

	* support/export/xtab.c (xtab_mount_read): Pass 1 instead of 0
	to xtab_read () for reading _PATH_XTAB.
---

diff --git a/ChangeLog b/ChangeLog
index b56dd18..2fcd4a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-08-09  H.J. Lu <hjl@lucon.org>
+
+	* etc/redhat/nfs.init: Run /usr/sbin/exportfs first during
+	startup to ensure all existing clients work fine.
+
+	* support/export/xtab.c (xtab_mount_read): Pass 1 instead of 0
+	to xtab_read () for reading _PATH_XTAB.
+
 2000-08-02  H.J. Lu <hjl@lucon.org>
 
 	* utils/mountd/auth.c (auth_authenticate_internal): Try to
diff --git a/etc/redhat/nfs.init b/etc/redhat/nfs.init
index a667619..eb95a24 100755
--- a/etc/redhat/nfs.init
+++ b/etc/redhat/nfs.init
@@ -36,6 +36,7 @@ RPCMOUNTDOPTS="--no-nfs-version 3"
 case "$1" in
   start)
 	# Start daemons.
+	action "Starting NFS services: " /usr/sbin/exportfs -r
 	echo -n "Starting NFS quotas: "
 	daemon rpc.rquotad
 	echo
@@ -45,9 +46,6 @@ case "$1" in
 	echo -n "Starting NFS daemon: "
 	daemon rpc.nfsd $RPCNFSDCOUNT
 	echo
-	# Do it the last so that all clients mounting points are
-	# exported. FIXME: Why?
-	action "Starting NFS services: " /usr/sbin/exportfs -r
 	touch /var/lock/subsys/nfs
 	;;
   stop)
diff --git a/support/export/xtab.c b/support/export/xtab.c
index 4289d7c..c8adc06 100644
--- a/support/export/xtab.c
+++ b/support/export/xtab.c
@@ -53,7 +53,7 @@ xtab_mount_read(void)
 		close(fd);
 		return xtab_read(_PATH_PROC_EXPORTS, 0);
 	} else
-		return xtab_read(_PATH_XTAB, 0);
+		return xtab_read(_PATH_XTAB, 1);
 }
 
 int