Bring carp interfaces up under rc.bootup, not the filter process

3 files changed, 11 insertions, 5 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index a6d6c88..ec4a0f3 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -189,11 +189,6 @@ function filter_configure() {
 		}
 	}
 	
-	/* lets bring the carp interfaces up now */
-	$carp_ints = find_number_of_created_carp_interfaces();
-	for($x=0; $x<$carp_ints; $x++)
-		mwexec("/sbin/ifconfig carp{$carp_instances_counter} up");
-	
 	if ($g['booting'])
 		echo "Done\n";
 	return 0;
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index e2f37d7..632368d 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -308,6 +308,14 @@ function interfaces_carp_configure() {
 	}
 }
 
+function interfaces_carp_bringup() {
+	global $g, $config;
+	/* lets bring the carp interfaces up now */
+	$carp_ints = find_number_of_created_carp_interfaces();
+	for($x=0; $x<$carp_ints; $x++)
+		mwexec("/sbin/ifconfig carp{$carp_instances_counter} up");	
+}
+
 function interfaces_wireless_configure($if, $wlcfg) {
 	global $config, $g;
 
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 63e7f85..e1912d9 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -116,6 +116,9 @@
 	/* setup altq + pf */
 	filter_configure();
 
+	/* bring up carp interfaces */
+	interfaces_carp_bringup();
+
 	/* start OpenVPN server & clients */
 	ovpn_configure();