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
This commit is contained in:
alfred 2001-12-13 04:21:18 +00:00
parent 3c2732d720
commit 2eaaa91f6f
7 changed files with 119 additions and 42 deletions

View File

@ -678,17 +678,17 @@ network_pass3() {
echo -n ' nfsd'; nfsd ${nfs_server_flags} echo -n ' nfsd'; nfsd ${nfs_server_flags}
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
case ${rpc_statd_enable} in case ${rpc_statd_enable} in
[Yy][Ee][Ss]) [Yy][Ee][Ss])
echo -n ' rpc.statd'; rpc.statd echo -n ' rpc.statd'; rpc.statd
;; ;;
esac esac
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
else else
echo -n ' Warning: nfs server failed' echo -n ' Warning: nfs server failed'
fi fi
@ -721,6 +721,17 @@ network_pass3() {
if [ -n "${nfs_bufpackets}" ]; then if [ -n "${nfs_bufpackets}" ]; then
sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
fi 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 esac

View File

@ -678,17 +678,17 @@ network_pass3() {
echo -n ' nfsd'; nfsd ${nfs_server_flags} echo -n ' nfsd'; nfsd ${nfs_server_flags}
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
case ${rpc_statd_enable} in case ${rpc_statd_enable} in
[Yy][Ee][Ss]) [Yy][Ee][Ss])
echo -n ' rpc.statd'; rpc.statd echo -n ' rpc.statd'; rpc.statd
;; ;;
esac esac
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
else else
echo -n ' Warning: nfs server failed' echo -n ' Warning: nfs server failed'
fi fi
@ -721,6 +721,17 @@ network_pass3() {
if [ -n "${nfs_bufpackets}" ]; then if [ -n "${nfs_bufpackets}" ]; then
sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
fi 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 esac

View File

@ -678,17 +678,17 @@ network_pass3() {
echo -n ' nfsd'; nfsd ${nfs_server_flags} echo -n ' nfsd'; nfsd ${nfs_server_flags}
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
case ${rpc_statd_enable} in case ${rpc_statd_enable} in
[Yy][Ee][Ss]) [Yy][Ee][Ss])
echo -n ' rpc.statd'; rpc.statd echo -n ' rpc.statd'; rpc.statd
;; ;;
esac esac
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
else else
echo -n ' Warning: nfs server failed' echo -n ' Warning: nfs server failed'
fi fi
@ -721,6 +721,17 @@ network_pass3() {
if [ -n "${nfs_bufpackets}" ]; then if [ -n "${nfs_bufpackets}" ]; then
sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
fi 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 esac

View File

@ -678,17 +678,17 @@ network_pass3() {
echo -n ' nfsd'; nfsd ${nfs_server_flags} echo -n ' nfsd'; nfsd ${nfs_server_flags}
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
case ${rpc_statd_enable} in case ${rpc_statd_enable} in
[Yy][Ee][Ss]) [Yy][Ee][Ss])
echo -n ' rpc.statd'; rpc.statd echo -n ' rpc.statd'; rpc.statd
;; ;;
esac esac
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
else else
echo -n ' Warning: nfs server failed' echo -n ' Warning: nfs server failed'
fi fi
@ -721,6 +721,17 @@ network_pass3() {
if [ -n "${nfs_bufpackets}" ]; then if [ -n "${nfs_bufpackets}" ]; then
sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
fi 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 esac

View File

@ -678,17 +678,17 @@ network_pass3() {
echo -n ' nfsd'; nfsd ${nfs_server_flags} echo -n ' nfsd'; nfsd ${nfs_server_flags}
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
case ${rpc_statd_enable} in case ${rpc_statd_enable} in
[Yy][Ee][Ss]) [Yy][Ee][Ss])
echo -n ' rpc.statd'; rpc.statd echo -n ' rpc.statd'; rpc.statd
;; ;;
esac esac
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
else else
echo -n ' Warning: nfs server failed' echo -n ' Warning: nfs server failed'
fi fi
@ -721,6 +721,17 @@ network_pass3() {
if [ -n "${nfs_bufpackets}" ]; then if [ -n "${nfs_bufpackets}" ]; then
sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
fi 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 esac

View File

@ -678,17 +678,17 @@ network_pass3() {
echo -n ' nfsd'; nfsd ${nfs_server_flags} echo -n ' nfsd'; nfsd ${nfs_server_flags}
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
case ${rpc_statd_enable} in case ${rpc_statd_enable} in
[Yy][Ee][Ss]) [Yy][Ee][Ss])
echo -n ' rpc.statd'; rpc.statd echo -n ' rpc.statd'; rpc.statd
;; ;;
esac esac
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
else else
echo -n ' Warning: nfs server failed' echo -n ' Warning: nfs server failed'
fi fi
@ -721,6 +721,17 @@ network_pass3() {
if [ -n "${nfs_bufpackets}" ]; then if [ -n "${nfs_bufpackets}" ]; then
sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
fi 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 esac

View File

@ -678,17 +678,17 @@ network_pass3() {
echo -n ' nfsd'; nfsd ${nfs_server_flags} echo -n ' nfsd'; nfsd ${nfs_server_flags}
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
case ${rpc_statd_enable} in case ${rpc_statd_enable} in
[Yy][Ee][Ss]) [Yy][Ee][Ss])
echo -n ' rpc.statd'; rpc.statd echo -n ' rpc.statd'; rpc.statd
;; ;;
esac esac
case ${rpc_lockd_enable} in
[Yy][Ee][Ss])
echo -n ' rpc.lockd'; rpc.lockd
;;
esac
else else
echo -n ' Warning: nfs server failed' echo -n ' Warning: nfs server failed'
fi fi
@ -721,6 +721,17 @@ network_pass3() {
if [ -n "${nfs_bufpackets}" ]; then if [ -n "${nfs_bufpackets}" ]; then
sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
fi 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 esac