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 b56dd18ea60170d40ef1f4edc0d38f10282a5d14..2fcd4a42fc0bdc6e4dc0188d407408317bf27b6b 100644 (file)
--- 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 a66761914eef4d1be2a13000706a7647b6ada506..eb95a24b29873d0063dfc8f8de3b1255edac2cd4 100755 (executable)
--- 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 4289d7ce5fc1537c6ce5b8d05e4088a761916f27..c8adc0672b3c96ba67d18530d8e0bd3057aa2652 100644 (file)
--- 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