From 61c25e53a20cc241316315f3af1717bbc80a7c4c Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Wed, 9 Mar 2005 23:09:33 +0000
Subject: Ignore interface mistmatch checks if either interface uses a vlan

---
 etc/rc.bootup | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/etc/rc.bootup b/etc/rc.bootup
index fd8a064..d242f96 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -44,21 +44,23 @@
 	$wan_if = get_real_wan_interface();
 
 	$do_assign = 0;
-
-	if(does_interface_exist($lan_if) == false) {
-		echo "\n\n\nLAN {$lan_if} interface mismatch.";
-		$do_assign = 1;
-	}
-	if($config['interfaces']['wan']['ipaddr'] <> "pppoe" && $config['interfaces']['wan']['ipaddr'] <> "pptp" && $do_assign == 0)
-		if(does_interface_exist($wan_if) == false) {
-			echo "\n\n\nWAN {$wan_if} interface mismatch.";
+	/* we need to ignore the vlan interface checks) */
+	if(stristr($lan_if,"vlan") == false or stristr($wan_if,"vlan") == false) {
+		if(does_interface_exist($lan_if) == false) {
+			echo "\n\n\nLAN {$lan_if} interface mismatch.";
 			$do_assign = 1;
-	}
-
-	if($do_assign == 1) {
-		$noreboot = true;
-		echo " -- Running interface assignment option.\n";
-		set_networking_interfaces_ports();
+		}
+		if($config['interfaces']['wan']['ipaddr'] <> "pppoe" && $config['interfaces']['wan']['ipaddr'] <> "pptp" && $do_assign == 0) {
+			if(does_interface_exist($wan_if) == false) {
+				echo "\n\n\nWAN {$wan_if} interface mismatch.";
+				$do_assign = 1;
+			}
+		}
+		if($do_assign == 1) {
+			$noreboot = true;
+			echo " -- Running interface assignment option.\n";
+			set_networking_interfaces_ports();
+		}
 	}
 
 	/* convert configuration, if necessary */
@@ -162,7 +164,7 @@
 	system_do_shell_commands();
 
 	/* start ftp proxy helpers if they are enabled */
-	system_start_ftp_helpers();	
+	system_start_ftp_helpers();
 
 	/* done */
 	unlink("{$g['varrun_path']}/booting");
-- 
cgit v1.1