o Hookup rc.d/routing and rc.d/netoptions

o Ensure rc.d/network2 and rc.d/network3 are not automatically run
  during boot
o Modify script headers so rcorder(8) can put the two scripts in the
  correct sequence.

10 files changed, 11 insertions, 11 deletions

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 734a362..35ea920 100755
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -12,10 +12,10 @@ FILES=	DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \
 	ldconfig local localdaemons lomac lpd \
 	motd mountcritlocal mountcritremote \
 	mountd moused mroute6d mrouted msgs \
-	named netif network1 network2 network3 \
+	named netif netoptions network1 network2 network3 \
 	network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \
 	ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \
-	rarpd rcconf.sh root route6d routed rpcbind rtadvd rwho savecore \
+	rarpd rcconf.sh root route6d routed routing rpcbind rtadvd rwho savecore \
 	securelevel sendmail serial sppp sshd swap1 syscons sysctl \
 	syslogd timed ttys usbd vinum virecover watchdogd ypbind \
 	yppasswdd ypserv ypset ypupdated ypxfrd
diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING
index 0a3b2ae..f4cdaa3 100644
--- a/etc/rc.d/NETWORKING
+++ b/etc/rc.d/NETWORKING
@@ -5,7 +5,7 @@
 #
 
 # PROVIDE: NETWORKING NETWORK
-# REQUIRE: network dhclient altqd netif network2 network_ipv6 isdnd ppp-user
+# REQUIRE: network dhclient altqd netif routing network_ipv6 isdnd ppp-user
 # REQUIRE: routed mrouted route6d mroute6d
 # KEYWORD: FreeBSD NetBSD
 
diff --git a/etc/rc.d/atm2 b/etc/rc.d/atm2
index 12acdcd..ad69f72 100644
--- a/etc/rc.d/atm2
+++ b/etc/rc.d/atm2
@@ -29,7 +29,7 @@
 
 # PROVIDE: atm2
 # REQUIRE: atm1 netif
-# BEFORE: network2
+# BEFORE:  routing
 # KEYWORD: FreeBSD
 
 #
diff --git a/etc/rc.d/atm2.sh b/etc/rc.d/atm2.sh
index 12acdcd..ad69f72 100644
--- a/etc/rc.d/atm2.sh
+++ b/etc/rc.d/atm2.sh
@@ -29,7 +29,7 @@
 
 # PROVIDE: atm2
 # REQUIRE: atm1 netif
-# BEFORE: network2
+# BEFORE:  routing
 # KEYWORD: FreeBSD
 
 #
diff --git a/etc/rc.d/ip6fw b/etc/rc.d/ip6fw
index e0726bf..6ae7689 100644
--- a/etc/rc.d/ip6fw
+++ b/etc/rc.d/ip6fw
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ip6fw
-# REQUIRE: network2
+# REQUIRE: routing
 # BEFORE: network_ipv6
 # KEYWORD: FreeBSD
 
diff --git a/etc/rc.d/mrouted b/etc/rc.d/mrouted
index b593988..d760d35 100755
--- a/etc/rc.d/mrouted
+++ b/etc/rc.d/mrouted
@@ -5,7 +5,7 @@
 #
 
 # PROVIDE: mrouted
-# REQUIRE: netif network2
+# REQUIRE: netif routing
 # KEYWORD: FreeBSD NetBSD
 
 . /etc/rc.subr
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 6478ab2..d162575 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -7,7 +7,7 @@
 
 # PROVIDE: network2
 # REQUIRE: netif ppp-user
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nostart
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index f18632f..5dc7495 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -6,7 +6,7 @@
 # PROVIDE: network3
 # REQUIRE: localdaemons
 # BEFORE:  securelevel
-# KEYWORD: FreeBSD
+# KEYWORD: FreeBSD nostart
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6
index 799c3b0..81d0178 100644
--- a/etc/rc.d/network_ipv6
+++ b/etc/rc.d/network_ipv6
@@ -29,7 +29,7 @@
 #
 
 # PROVIDE: network_ipv6
-# REQUIRE: network2
+# REQUIRE: routing
 # KEYWORD: FreeBSD
 
 . /etc/rc.subr
diff --git a/etc/rc.d/routed b/etc/rc.d/routed
index 892967c..e26dbe1 100755
--- a/etc/rc.d/routed
+++ b/etc/rc.d/routed
@@ -5,7 +5,7 @@
 #
 
 # PROVIDE: routed
-# REQUIRE: netif network2
+# REQUIRE: netif routing
 # KEYWORD: FreeBSD NetBSD
 
 . /etc/rc.subr