From 16b671e2152b336c368855d28d4ec05293d4cb1c Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 17 May 2008 20:41:14 +0000
Subject: Ticket #1677 fixes

---
 etc/inc/interfaces.inc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 0b7c6d7..a907ccd 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -506,6 +506,14 @@ function interfaces_carp_bring_up_final() {
 	/* could not locate an array, return */
 	if(!is_array($viparr))
 		return;
+	$havecarp = false;
+	foreach ($viparr as $vip) {
+		/* bail if this isn't a carp VIP */
+		if ($vip['mode'] == "carp")
+			$havecarp = true;
+	}		
+	if($havecarp == false) 
+		return;
 	$carp_instances_counter = 0;
 	$counter = 0;
 	if($g['booting'])
@@ -520,10 +528,6 @@ function interfaces_carp_bring_up_final() {
 			$counter++;
 			echo ".";
 		}
-		for($x=0; $x<23; $x++) {
-			sleep(2);
-			echo ".";
-		}
 		echo " done.\n";
 	}
 	foreach ($viparr as $vip) {
-- 
cgit v1.1