summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rwxr-xr-xetc/redhat/nfs.init4
-rw-r--r--support/export/xtab.c2
3 files changed, 10 insertions, 4 deletions
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