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.

5 files changed, 40 insertions, 45 deletions

diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 9d868af..2bf0b58 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 9d868af..2bf0b58 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 9d868af..2bf0b58 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 9d868af..2bf0b58 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 9d868af..2bf0b58 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