From 2eaaa91f6f2e878a476fbf3758ffba37cdf38d4b Mon Sep 17 00:00:00 2001 From: alfred Date: Thu, 13 Dec 2001 04:21:18 +0000 Subject: [PATCH] rpc.lockd needs rpc.statd to be running for it to start up properly. so swap the order. Also allow rpc.lockd and rpc.statd to be turned on if nfsclient is enabled. They are needed to provide client side locking support. PR: conf/27811 --- etc/network.subr | 19 +++++++++++++++---- etc/rc.d/netoptions | 19 +++++++++++++++---- etc/rc.d/network1 | 19 +++++++++++++++---- etc/rc.d/network2 | 19 +++++++++++++++---- etc/rc.d/network3 | 19 +++++++++++++++---- etc/rc.d/routing | 19 +++++++++++++++---- etc/rc.network | 19 +++++++++++++++---- 7 files changed, 105 insertions(+), 28 deletions(-) diff --git a/etc/network.subr b/etc/network.subr index fa6af3e758a..d6da093ef63 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -678,15 +678,15 @@ network_pass3() { echo -n ' nfsd'; nfsd ${nfs_server_flags} - case ${rpc_lockd_enable} in + case ${rpc_statd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.lockd'; rpc.lockd + echo -n ' rpc.statd'; rpc.statd ;; esac - case ${rpc_statd_enable} in + case ${rpc_lockd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.statd'; rpc.statd + echo -n ' rpc.lockd'; rpc.lockd ;; esac else @@ -721,6 +721,17 @@ network_pass3() { if [ -n "${nfs_bufpackets}" ]; then sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi + case ${rpc_statd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.statd'; rpc.statd + ;; + esac + + case ${rpc_lockd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.lockd'; rpc.lockd + ;; + esac ;; esac diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index fa6af3e758a..d6da093ef63 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -678,15 +678,15 @@ network_pass3() { echo -n ' nfsd'; nfsd ${nfs_server_flags} - case ${rpc_lockd_enable} in + case ${rpc_statd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.lockd'; rpc.lockd + echo -n ' rpc.statd'; rpc.statd ;; esac - case ${rpc_statd_enable} in + case ${rpc_lockd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.statd'; rpc.statd + echo -n ' rpc.lockd'; rpc.lockd ;; esac else @@ -721,6 +721,17 @@ network_pass3() { if [ -n "${nfs_bufpackets}" ]; then sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi + case ${rpc_statd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.statd'; rpc.statd + ;; + esac + + case ${rpc_lockd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.lockd'; rpc.lockd + ;; + esac ;; esac diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index fa6af3e758a..d6da093ef63 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -678,15 +678,15 @@ network_pass3() { echo -n ' nfsd'; nfsd ${nfs_server_flags} - case ${rpc_lockd_enable} in + case ${rpc_statd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.lockd'; rpc.lockd + echo -n ' rpc.statd'; rpc.statd ;; esac - case ${rpc_statd_enable} in + case ${rpc_lockd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.statd'; rpc.statd + echo -n ' rpc.lockd'; rpc.lockd ;; esac else @@ -721,6 +721,17 @@ network_pass3() { if [ -n "${nfs_bufpackets}" ]; then sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi + case ${rpc_statd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.statd'; rpc.statd + ;; + esac + + case ${rpc_lockd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.lockd'; rpc.lockd + ;; + esac ;; esac diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index fa6af3e758a..d6da093ef63 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -678,15 +678,15 @@ network_pass3() { echo -n ' nfsd'; nfsd ${nfs_server_flags} - case ${rpc_lockd_enable} in + case ${rpc_statd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.lockd'; rpc.lockd + echo -n ' rpc.statd'; rpc.statd ;; esac - case ${rpc_statd_enable} in + case ${rpc_lockd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.statd'; rpc.statd + echo -n ' rpc.lockd'; rpc.lockd ;; esac else @@ -721,6 +721,17 @@ network_pass3() { if [ -n "${nfs_bufpackets}" ]; then sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi + case ${rpc_statd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.statd'; rpc.statd + ;; + esac + + case ${rpc_lockd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.lockd'; rpc.lockd + ;; + esac ;; esac diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index fa6af3e758a..d6da093ef63 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -678,15 +678,15 @@ network_pass3() { echo -n ' nfsd'; nfsd ${nfs_server_flags} - case ${rpc_lockd_enable} in + case ${rpc_statd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.lockd'; rpc.lockd + echo -n ' rpc.statd'; rpc.statd ;; esac - case ${rpc_statd_enable} in + case ${rpc_lockd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.statd'; rpc.statd + echo -n ' rpc.lockd'; rpc.lockd ;; esac else @@ -721,6 +721,17 @@ network_pass3() { if [ -n "${nfs_bufpackets}" ]; then sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi + case ${rpc_statd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.statd'; rpc.statd + ;; + esac + + case ${rpc_lockd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.lockd'; rpc.lockd + ;; + esac ;; esac diff --git a/etc/rc.d/routing b/etc/rc.d/routing index fa6af3e758a..d6da093ef63 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -678,15 +678,15 @@ network_pass3() { echo -n ' nfsd'; nfsd ${nfs_server_flags} - case ${rpc_lockd_enable} in + case ${rpc_statd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.lockd'; rpc.lockd + echo -n ' rpc.statd'; rpc.statd ;; esac - case ${rpc_statd_enable} in + case ${rpc_lockd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.statd'; rpc.statd + echo -n ' rpc.lockd'; rpc.lockd ;; esac else @@ -721,6 +721,17 @@ network_pass3() { if [ -n "${nfs_bufpackets}" ]; then sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi + case ${rpc_statd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.statd'; rpc.statd + ;; + esac + + case ${rpc_lockd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.lockd'; rpc.lockd + ;; + esac ;; esac diff --git a/etc/rc.network b/etc/rc.network index fa6af3e758a..d6da093ef63 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -678,15 +678,15 @@ network_pass3() { echo -n ' nfsd'; nfsd ${nfs_server_flags} - case ${rpc_lockd_enable} in + case ${rpc_statd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.lockd'; rpc.lockd + echo -n ' rpc.statd'; rpc.statd ;; esac - case ${rpc_statd_enable} in + case ${rpc_lockd_enable} in [Yy][Ee][Ss]) - echo -n ' rpc.statd'; rpc.statd + echo -n ' rpc.lockd'; rpc.lockd ;; esac else @@ -721,6 +721,17 @@ network_pass3() { if [ -n "${nfs_bufpackets}" ]; then sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi + case ${rpc_statd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.statd'; rpc.statd + ;; + esac + + case ${rpc_lockd_enable} in + [Yy][Ee][Ss]) + echo -n ' rpc.lockd'; rpc.lockd + ;; + esac ;; esac -- 2.45.0