aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorAlfred Perlstein <alfred@FreeBSD.org>2001-12-13 04:21:18 +0000
committerAlfred Perlstein <alfred@FreeBSD.org>2001-12-13 04:21:18 +0000
commitbcb733d069ee3a1768be54caf89be82b6a902b52 (patch)
tree94a8654f0477c41fbbb420fc18b08b373dae3752 /etc
parent04cad5adb1620fe0f96181895fb7ef8292fc2ea3 (diff)
downloadsrc-bcb733d069ee3a1768be54caf89be82b6a902b52.tar.gz
src-bcb733d069ee3a1768be54caf89be82b6a902b52.zip
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
Notes
Notes: svn path=/head/; revision=87781
Diffstat (limited to 'etc')
-rw-r--r--etc/network.subr19
-rw-r--r--etc/rc.d/netoptions19
-rw-r--r--etc/rc.d/network119
-rw-r--r--etc/rc.d/network219
-rw-r--r--etc/rc.d/network319
-rw-r--r--etc/rc.d/routing19
-rw-r--r--etc/rc.network19
7 files changed, 105 insertions, 28 deletions
diff --git a/etc/network.subr b/etc/network.subr
index fa6af3e758a3..d6da093ef634 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 fa6af3e758a3..d6da093ef634 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 fa6af3e758a3..d6da093ef634 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 fa6af3e758a3..d6da093ef634 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 fa6af3e758a3..d6da093ef634 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 fa6af3e758a3..d6da093ef634 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 fa6af3e758a3..d6da093ef634 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 07:18:42 +0000