svn commit: r193198 - head/etc/rc.d

[Doug Barton]

Author: dougb
Date: Mon Jun  1 05:35:03 2009
New Revision: 193198
URL: http://svn.freebsd.org/changeset/base/193198

Log:
  Make the pf and ipfw firewalls start before netif, just like ipfilter
  already does. This eliminates a logical inconsistency, and a small
  window where the system is open after the network comes up.

Modified:
  head/etc/rc.d/ip6fw
  head/etc/rc.d/ipfilter
  head/etc/rc.d/ipfs
  head/etc/rc.d/ipfw
  head/etc/rc.d/ipnat
  head/etc/rc.d/netif
  head/etc/rc.d/network_ipv6
  head/etc/rc.d/pf
  head/etc/rc.d/pflog
  head/etc/rc.d/pfsync

Modified: head/etc/rc.d/ip6fw
==============================================================================
--- head/etc/rc.d/ip6fw	Mon Jun  1 04:55:13 2009	(r193197)
+++ head/etc/rc.d/ip6fw	Mon Jun  1 05:35:03 2009	(r193198)
@@ -5,7 +5,6 @@
 
 # PROVIDE: ip6fw
 # REQUIRE: routing
-# BEFORE: network_ipv6
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: head/etc/rc.d/ipfilter
==============================================================================
--- head/etc/rc.d/ipfilter	Mon Jun  1 04:55:13 2009	(r193197)
+++ head/etc/rc.d/ipfilter	Mon Jun  1 05:35:03 2009	(r193198)
@@ -5,7 +5,6 @@
 
 # PROVIDE: ipfilter
 # REQUIRE: FILESYSTEMS
-# BEFORE:  netif
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: head/etc/rc.d/ipfs
==============================================================================
--- head/etc/rc.d/ipfs	Mon Jun  1 04:55:13 2009	(r193197)
+++ head/etc/rc.d/ipfs	Mon Jun  1 05:35:03 2009	(r193198)
@@ -5,7 +5,6 @@
 
 # PROVIDE: ipfs
 # REQUIRE: ipnat
-# BEFORE:  netif
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr

Modified: head/etc/rc.d/ipfw
==============================================================================
--- head/etc/rc.d/ipfw	Mon Jun  1 04:55:13 2009	(r193197)
+++ head/etc/rc.d/ipfw	Mon Jun  1 05:35:03 2009	(r193198)
@@ -4,8 +4,7 @@
 #
 
 # PROVIDE: ipfw
-# REQUIRE: ppp
-# BEFORE: NETWORKING
+# REQUIRE: FILESYSTEMS
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: head/etc/rc.d/ipnat
==============================================================================
--- head/etc/rc.d/ipnat	Mon Jun  1 04:55:13 2009	(r193197)
+++ head/etc/rc.d/ipnat	Mon Jun  1 05:35:03 2009	(r193198)
@@ -5,7 +5,6 @@
 
 # PROVIDE: ipnat
 # REQUIRE: ipfilter
-# BEFORE:  DAEMON netif
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: head/etc/rc.d/netif
==============================================================================
--- head/etc/rc.d/netif	Mon Jun  1 04:55:13 2009	(r193197)
+++ head/etc/rc.d/netif	Mon Jun  1 05:35:03 2009	(r193198)
@@ -26,7 +26,8 @@
 #
 
 # PROVIDE: netif
-# REQUIRE: atm1 cleanvar ipfilter FILESYSTEMS serial sppp sysctl
+# REQUIRE: atm1 cleanvar FILESYSTEMS serial sppp sysctl
+# REQUIRE: ipfilter ipfs pf ipfw
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: head/etc/rc.d/network_ipv6
==============================================================================
--- head/etc/rc.d/network_ipv6	Mon Jun  1 04:55:13 2009	(r193197)
+++ head/etc/rc.d/network_ipv6	Mon Jun  1 05:35:03 2009	(r193198)
@@ -29,7 +29,7 @@
 #
 
 # PROVIDE: network_ipv6
-# REQUIRE: routing
+# REQUIRE: routing ip6fw
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: head/etc/rc.d/pf
==============================================================================
--- head/etc/rc.d/pf	Mon Jun  1 04:55:13 2009	(r193197)
+++ head/etc/rc.d/pf	Mon Jun  1 05:35:03 2009	(r193198)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: pf
-# REQUIRE: FILESYSTEMS netif pflog pfsync
+# REQUIRE: FILESYSTEMS pflog pfsync
 # BEFORE:  routing
 # KEYWORD: nojail
 

Modified: head/etc/rc.d/pflog
==============================================================================
--- head/etc/rc.d/pflog	Mon Jun  1 04:55:13 2009	(r193197)
+++ head/etc/rc.d/pflog	Mon Jun  1 05:35:03 2009	(r193198)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: pflog
-# REQUIRE: FILESYSTEMS netif cleanvar
+# REQUIRE: FILESYSTEMS cleanvar
 # KEYWORD: nojail
 
 . /etc/rc.subr

Modified: head/etc/rc.d/pfsync
==============================================================================
--- head/etc/rc.d/pfsync	Mon Jun  1 04:55:13 2009	(r193197)
+++ head/etc/rc.d/pfsync	Mon Jun  1 05:35:03 2009	(r193198)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: pfsync
-# REQUIRE: FILESYSTEMS netif
+# REQUIRE: FILESYSTEMS
 # KEYWORD: nojail
 
 . /etc/rc.subr