diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/network.subr | 7 | ||||
| -rw-r--r-- | etc/rc | 42 | ||||
| -rw-r--r-- | etc/rc.d/netoptions | 7 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 7 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 7 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 7 | ||||
| -rw-r--r-- | etc/rc.d/routing | 7 | ||||
| -rw-r--r-- | etc/rc.network | 7 |
8 files changed, 53 insertions, 38 deletions
diff --git a/etc/network.subr b/etc/network.subr index f51c612..cf79733 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -536,6 +536,13 @@ network_pass3() { ;; esac + # If /var/db/mounttab exists, some nfs-server has not been + # sucessfully notified about a previous client shutdown. + # If there is no /var/db/mounttab, we do nothing. + if [ -f /var/db/mounttab ]; then + rpc.umntall -k + fi + case ${amd_enable} in [Yy][Ee][Ss]) echo -n ' amd' @@ -113,23 +113,8 @@ esac umount -a >/dev/null 2>&1 -# Early NFS mounts and clean up of /var/db/mounttab. -# -case ${early_nfs_mounts} in -[Yy][Ee][Ss]) - case $1 in - autoboot) - if [ -f /var/db/mounttab ]; then - rpc.umntall -k - fi - ;; - esac - mount -a - ;; -*) - mount -a -t nonfs - ;; -esac +# Mount everything except nfs filesystems. +mount -a -t nonfs case $? in 0) @@ -206,28 +191,9 @@ if [ -r /etc/rc.network ]; then network_pass1 fi -# Only mount NFS file systems if $early_nfs_mounts is false. -# If there is a /var/db/mounttab, clean it up with rpc.umntall. -# +# Mount NFS filesystems. echo -n "Mounting NFS file systems" -case ${early_nfs_mounts} in -[Yy][Ee][Ss]) - ;; -*) - case $1 in - autoboot) - case ${nfs_client_enable} in - [Yy][Ee][Ss]) - if [ -f /var/db/mounttab ]; then - rpc.umntall -k - fi - ;; - esac - ;; - esac - mount -a -t nfs - ;; -esac +mount -a -t nfs echo . # Whack the pty perms back into shape. diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index f51c612..cf79733 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -536,6 +536,13 @@ network_pass3() { ;; esac + # If /var/db/mounttab exists, some nfs-server has not been + # sucessfully notified about a previous client shutdown. + # If there is no /var/db/mounttab, we do nothing. + if [ -f /var/db/mounttab ]; then + rpc.umntall -k + fi + case ${amd_enable} in [Yy][Ee][Ss]) echo -n ' amd' diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index f51c612..cf79733 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -536,6 +536,13 @@ network_pass3() { ;; esac + # If /var/db/mounttab exists, some nfs-server has not been + # sucessfully notified about a previous client shutdown. + # If there is no /var/db/mounttab, we do nothing. + if [ -f /var/db/mounttab ]; then + rpc.umntall -k + fi + case ${amd_enable} in [Yy][Ee][Ss]) echo -n ' amd' diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index f51c612..cf79733 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -536,6 +536,13 @@ network_pass3() { ;; esac + # If /var/db/mounttab exists, some nfs-server has not been + # sucessfully notified about a previous client shutdown. + # If there is no /var/db/mounttab, we do nothing. + if [ -f /var/db/mounttab ]; then + rpc.umntall -k + fi + case ${amd_enable} in [Yy][Ee][Ss]) echo -n ' amd' diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index f51c612..cf79733 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -536,6 +536,13 @@ network_pass3() { ;; esac + # If /var/db/mounttab exists, some nfs-server has not been + # sucessfully notified about a previous client shutdown. + # If there is no /var/db/mounttab, we do nothing. + if [ -f /var/db/mounttab ]; then + rpc.umntall -k + fi + case ${amd_enable} in [Yy][Ee][Ss]) echo -n ' amd' diff --git a/etc/rc.d/routing b/etc/rc.d/routing index f51c612..cf79733 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -536,6 +536,13 @@ network_pass3() { ;; esac + # If /var/db/mounttab exists, some nfs-server has not been + # sucessfully notified about a previous client shutdown. + # If there is no /var/db/mounttab, we do nothing. + if [ -f /var/db/mounttab ]; then + rpc.umntall -k + fi + case ${amd_enable} in [Yy][Ee][Ss]) echo -n ' amd' diff --git a/etc/rc.network b/etc/rc.network index f51c612..cf79733 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -536,6 +536,13 @@ network_pass3() { ;; esac + # If /var/db/mounttab exists, some nfs-server has not been + # sucessfully notified about a previous client shutdown. + # If there is no /var/db/mounttab, we do nothing. + if [ -f /var/db/mounttab ]; then + rpc.umntall -k + fi + case ${amd_enable} in [Yy][Ee][Ss]) echo -n ' amd' |
