Move options that do not have anything to do with routing out of

rc.d/routing and in to rc.d/netoptions. Also instead of saying
"TCP options" say "IP options".

2 files changed, 43 insertions, 42 deletions

diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index c4ea590..7104952 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -11,7 +11,7 @@
 
 load_rc_config 'XXX'
 
-echo -n 'Additional TCP options:'
+echo -n 'Additional IP options:'
 case ${log_in_vain} in
 [Nn][Oo] | '')
 	log_in_vain=0
@@ -32,4 +32,46 @@ esac
 	sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null
 	sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null
 )
+
+case ${tcp_extensions} in
+[Yy][Ee][Ss] | '')
+	;;
+*)
+	echo -n ' tcp extensions=NO'
+	sysctl net.inet.tcp.rfc1323=0 >/dev/null
+	;;
+esac
+
+case ${tcp_keepalive} in
+[Nn][Oo])
+	echo -n ' TCP keepalive=NO'
+	sysctl net.inet.tcp.always_keepalive=0 >/dev/null
+	;;
+esac
+
+case ${tcp_drop_synfin} in
+[Yy][Ee][Ss])
+	echo -n ' drop SYN+FIN packets=YES'
+	sysctl net.inet.tcp.drop_synfin=1 >/dev/null
+	;;
+esac
+
+case ${ip_portrange_first} in
+[Nn][Oo] | '')
+	;;
+*)
+	echo -n " ip_portrange_first=$ip_portrange_first"
+	sysctl net.inet.ip.portrange.first=$ip_portrange_first >/dev/null
+	;;
+esac
+
+case ${ip_portrange_last} in
+[Nn][Oo] | '')
+	;;
+*)
+	echo -n " ip_portrange_last=$ip_portrange_last"
+	sysctl net.inet.ip.portrange.last=$ip_portrange_last >/dev/null
+	;;
+esac
+
 echo '.'
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index e251a97..874eda5 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -61,15 +61,6 @@ static_start()
 options_start()
 {
 	echo -n 'Additional routing options:'
-	case ${tcp_extensions} in
-	[Yy][Ee][Ss] | '')
-		;;
-	*)
-		echo -n ' tcp extensions=NO'
-		sysctl net.inet.tcp.rfc1323=0 >/dev/null
-		;;
-	esac
-
 	case ${icmp_bmcastecho} in
 	[Yy][Ee][Ss])
 		echo -n ' broadcast ping responses=YES'
@@ -112,20 +103,6 @@ options_start()
 		;;
 	esac
 
-	case ${tcp_keepalive} in
-	[Nn][Oo])
-		echo -n ' TCP keepalive=NO'
-		sysctl net.inet.tcp.always_keepalive=0 >/dev/null
-		;;
-	esac
-
-	case ${tcp_drop_synfin} in
-	[Yy][Ee][Ss])
-		echo -n ' drop SYN+FIN packets=YES'
-		sysctl net.inet.tcp.drop_synfin=1 >/dev/null
-		;;
-	esac
-
 	case ${ipxgateway_enable} in
 	[Yy][Ee][Ss])
 		echo -n ' IPX gateway=YES'
@@ -140,24 +117,6 @@ options_start()
 		;;
 	esac
 
-	case ${ip_portrange_first} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		echo -n " ip_portrange_first=$ip_portrange_first"
-		sysctl net.inet.ip.portrange.first=$ip_portrange_first >/dev/null
-		;;
-	esac
-
-	case ${ip_portrange_last} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		echo -n " ip_portrange_last=$ip_portrange_last"
-		sysctl net.inet.ip.portrange.last=$ip_portrange_last >/dev/null
-		;;
-	esac
-
 	echo '.'
 }