diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2001-09-19 00:22:26 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2001-09-19 00:22:26 +0000 |
| commit | 06fec2cf89167eacebe0f1d6335dd198ad4e8c0d (patch) | |
| tree | 943f7749e54d308ec1c76aec34b79738b7130bbc | |
| parent | abb64706254122fb49b2aa725774687792ee72cd (diff) | |
The vfs.nfs.bufpackets sysctl is in the client, not the server. Move it
to the client section. Turn off nfsiod, it no longer exists (now just
kthreads). I need revisit nfsiod so that we have an argument passthrough.
Notes
Notes:
svn path=/head/; revision=83656
| -rw-r--r-- | etc/network.subr | 17 | ||||
| -rw-r--r-- | etc/rc.d/netoptions | 17 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 17 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 17 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 17 | ||||
| -rw-r--r-- | etc/rc.d/routing | 17 | ||||
| -rw-r--r-- | etc/rc.network | 17 |
7 files changed, 56 insertions, 63 deletions
diff --git a/etc/network.subr b/etc/network.subr index 9d868af8916a..2bf0b58e6fc5 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -611,16 +611,12 @@ network_pass3() { case ${nfs_reserved_port_only} in [Yy][Ee][Ss]) echo -n ' NFS on reserved port only=YES' - sysctl -w vfs.nfs.nfs_privport=1 > /dev/null + sysctl -w vfs.nfsrv.nfs_privport=1 > /dev/null ;; esac echo -n ' nfsd'; nfsd ${nfs_server_flags} - if [ -n "${nfs_bufpackets}" ]; then - sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null - fi - case ${rpc_lockd_enable} in [Yy][Ee][Ss]) echo -n ' rpc.lockd'; rpc.lockd @@ -655,10 +651,13 @@ network_pass3() { case ${nfs_client_enable} in [Yy][Ee][Ss]) - echo -n ' nfsiod'; nfsiod ${nfs_client_flags} - if [ -n "${nfs_access_cache}" ]; then - echo -n " NFS access cache time=${nfs_access_cache}" - sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + #echo -n ' nfsiod'; nfsiod ${nfs_client_flags} + if [ -n "${nfs_access_cache}" ]; then + echo -n " NFS access cache time=${nfs_access_cache}" + sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + fi + if [ -n "${nfs_bufpackets}" ]; then + sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi ;; esac diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 9d868af8916a..2bf0b58e6fc5 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -611,16 +611,12 @@ network_pass3() { case ${nfs_reserved_port_only} in [Yy][Ee][Ss]) echo -n ' NFS on reserved port only=YES' - sysctl -w vfs.nfs.nfs_privport=1 > /dev/null + sysctl -w vfs.nfsrv.nfs_privport=1 > /dev/null ;; esac echo -n ' nfsd'; nfsd ${nfs_server_flags} - if [ -n "${nfs_bufpackets}" ]; then - sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null - fi - case ${rpc_lockd_enable} in [Yy][Ee][Ss]) echo -n ' rpc.lockd'; rpc.lockd @@ -655,10 +651,13 @@ network_pass3() { case ${nfs_client_enable} in [Yy][Ee][Ss]) - echo -n ' nfsiod'; nfsiod ${nfs_client_flags} - if [ -n "${nfs_access_cache}" ]; then - echo -n " NFS access cache time=${nfs_access_cache}" - sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + #echo -n ' nfsiod'; nfsiod ${nfs_client_flags} + if [ -n "${nfs_access_cache}" ]; then + echo -n " NFS access cache time=${nfs_access_cache}" + sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + fi + if [ -n "${nfs_bufpackets}" ]; then + sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi ;; esac diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 9d868af8916a..2bf0b58e6fc5 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -611,16 +611,12 @@ network_pass3() { case ${nfs_reserved_port_only} in [Yy][Ee][Ss]) echo -n ' NFS on reserved port only=YES' - sysctl -w vfs.nfs.nfs_privport=1 > /dev/null + sysctl -w vfs.nfsrv.nfs_privport=1 > /dev/null ;; esac echo -n ' nfsd'; nfsd ${nfs_server_flags} - if [ -n "${nfs_bufpackets}" ]; then - sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null - fi - case ${rpc_lockd_enable} in [Yy][Ee][Ss]) echo -n ' rpc.lockd'; rpc.lockd @@ -655,10 +651,13 @@ network_pass3() { case ${nfs_client_enable} in [Yy][Ee][Ss]) - echo -n ' nfsiod'; nfsiod ${nfs_client_flags} - if [ -n "${nfs_access_cache}" ]; then - echo -n " NFS access cache time=${nfs_access_cache}" - sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + #echo -n ' nfsiod'; nfsiod ${nfs_client_flags} + if [ -n "${nfs_access_cache}" ]; then + echo -n " NFS access cache time=${nfs_access_cache}" + sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + fi + if [ -n "${nfs_bufpackets}" ]; then + sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi ;; esac diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 9d868af8916a..2bf0b58e6fc5 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -611,16 +611,12 @@ network_pass3() { case ${nfs_reserved_port_only} in [Yy][Ee][Ss]) echo -n ' NFS on reserved port only=YES' - sysctl -w vfs.nfs.nfs_privport=1 > /dev/null + sysctl -w vfs.nfsrv.nfs_privport=1 > /dev/null ;; esac echo -n ' nfsd'; nfsd ${nfs_server_flags} - if [ -n "${nfs_bufpackets}" ]; then - sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null - fi - case ${rpc_lockd_enable} in [Yy][Ee][Ss]) echo -n ' rpc.lockd'; rpc.lockd @@ -655,10 +651,13 @@ network_pass3() { case ${nfs_client_enable} in [Yy][Ee][Ss]) - echo -n ' nfsiod'; nfsiod ${nfs_client_flags} - if [ -n "${nfs_access_cache}" ]; then - echo -n " NFS access cache time=${nfs_access_cache}" - sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + #echo -n ' nfsiod'; nfsiod ${nfs_client_flags} + if [ -n "${nfs_access_cache}" ]; then + echo -n " NFS access cache time=${nfs_access_cache}" + sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + fi + if [ -n "${nfs_bufpackets}" ]; then + sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi ;; esac diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 9d868af8916a..2bf0b58e6fc5 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -611,16 +611,12 @@ network_pass3() { case ${nfs_reserved_port_only} in [Yy][Ee][Ss]) echo -n ' NFS on reserved port only=YES' - sysctl -w vfs.nfs.nfs_privport=1 > /dev/null + sysctl -w vfs.nfsrv.nfs_privport=1 > /dev/null ;; esac echo -n ' nfsd'; nfsd ${nfs_server_flags} - if [ -n "${nfs_bufpackets}" ]; then - sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null - fi - case ${rpc_lockd_enable} in [Yy][Ee][Ss]) echo -n ' rpc.lockd'; rpc.lockd @@ -655,10 +651,13 @@ network_pass3() { case ${nfs_client_enable} in [Yy][Ee][Ss]) - echo -n ' nfsiod'; nfsiod ${nfs_client_flags} - if [ -n "${nfs_access_cache}" ]; then - echo -n " NFS access cache time=${nfs_access_cache}" - sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + #echo -n ' nfsiod'; nfsiod ${nfs_client_flags} + if [ -n "${nfs_access_cache}" ]; then + echo -n " NFS access cache time=${nfs_access_cache}" + sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + fi + if [ -n "${nfs_bufpackets}" ]; then + sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi ;; esac diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 9d868af8916a..2bf0b58e6fc5 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -611,16 +611,12 @@ network_pass3() { case ${nfs_reserved_port_only} in [Yy][Ee][Ss]) echo -n ' NFS on reserved port only=YES' - sysctl -w vfs.nfs.nfs_privport=1 > /dev/null + sysctl -w vfs.nfsrv.nfs_privport=1 > /dev/null ;; esac echo -n ' nfsd'; nfsd ${nfs_server_flags} - if [ -n "${nfs_bufpackets}" ]; then - sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null - fi - case ${rpc_lockd_enable} in [Yy][Ee][Ss]) echo -n ' rpc.lockd'; rpc.lockd @@ -655,10 +651,13 @@ network_pass3() { case ${nfs_client_enable} in [Yy][Ee][Ss]) - echo -n ' nfsiod'; nfsiod ${nfs_client_flags} - if [ -n "${nfs_access_cache}" ]; then - echo -n " NFS access cache time=${nfs_access_cache}" - sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + #echo -n ' nfsiod'; nfsiod ${nfs_client_flags} + if [ -n "${nfs_access_cache}" ]; then + echo -n " NFS access cache time=${nfs_access_cache}" + sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + fi + if [ -n "${nfs_bufpackets}" ]; then + sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi ;; esac diff --git a/etc/rc.network b/etc/rc.network index 9d868af8916a..2bf0b58e6fc5 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -611,16 +611,12 @@ network_pass3() { case ${nfs_reserved_port_only} in [Yy][Ee][Ss]) echo -n ' NFS on reserved port only=YES' - sysctl -w vfs.nfs.nfs_privport=1 > /dev/null + sysctl -w vfs.nfsrv.nfs_privport=1 > /dev/null ;; esac echo -n ' nfsd'; nfsd ${nfs_server_flags} - if [ -n "${nfs_bufpackets}" ]; then - sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null - fi - case ${rpc_lockd_enable} in [Yy][Ee][Ss]) echo -n ' rpc.lockd'; rpc.lockd @@ -655,10 +651,13 @@ network_pass3() { case ${nfs_client_enable} in [Yy][Ee][Ss]) - echo -n ' nfsiod'; nfsiod ${nfs_client_flags} - if [ -n "${nfs_access_cache}" ]; then - echo -n " NFS access cache time=${nfs_access_cache}" - sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + #echo -n ' nfsiod'; nfsiod ${nfs_client_flags} + if [ -n "${nfs_access_cache}" ]; then + echo -n " NFS access cache time=${nfs_access_cache}" + sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + fi + if [ -n "${nfs_bufpackets}" ]; then + sysctl -w vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null fi ;; esac |