* remove the temporary rule loading workarounds in /etc/rc

* adjust the boot order slightly in rc.bootup
* rename filter_ipmon_start to filter_pflog_start

1 files changed, 6 insertions, 9 deletions

diff --git a/etc/rc.bootup b/etc/rc.bootup
index 2b7e960..bb694e5 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -65,9 +65,6 @@
 	if (!in_array($g['platform'], $g['nopccard_platforms']))
 		system_pccard_start();
 
-	/* establish pf and altq ruleset */
-	filter_configure();
-
 	/* configure loopback interface */
 	interfaces_loopback_configure();
 
@@ -83,14 +80,14 @@
 	/* set up Optional interfaces */
 	interfaces_optional_configure();
 
-	/* start OpenVPN server & clients */
-	ovpn_configure();
+	/* start pflog */
+	filter_pflog_start();
 
-	/* resync ipfilter */
-	filter_resync();
+	/* setup altq + pf */
+	filter_configure();
 
-	/* start ipmon */
-	filter_ipmon_start();
+	/* start OpenVPN server & clients */
+	ovpn_configure();
 
 	/* set up static routes */
 	system_routing_configure();