From 3134528d8449514a7378bf245179a8e2124c820a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= <eri@pfsense.org>
Date: Tue, 5 Aug 2008 22:21:14 +0000
Subject: Rename the bridge knob to bridged so that the upgrade code works
 correctly and we play by the rules of the parser.

---
 etc/inc/config.inc     | 4 ++--
 etc/inc/interfaces.inc | 4 ++--
 etc/inc/xmlparse.inc   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'etc/inc')

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index acf9231..d49fa01 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1671,7 +1671,7 @@ function convert_config() {
 		foreach($config['interfaces'] as $intf) {
 			if (isset($intf['bridge']) && $intf['bridge'] <> "") {
 				$config['bridges'] = array();
-				$config['bridges']['bridge'] = array();
+				$config['bridges']['bridged'] = array();
 				$convert_bridges = true;
 				break;
 			}
@@ -1684,7 +1684,7 @@ function convert_config() {
 					$nbridge['members'] = "{$ifr},{$intf['bridge']}";
 					$nbridge['descr'] = "Converted bridged {$ifr}";
 					$nbridge['bridgeif'] = "bridge{$i}";
-					$config['bridges']['bridge'][] = $nbridge;
+					$config['bridges']['bridged'][] = $nbridge;
 					unset($intf['bridge']);
 					$i++;
 				}
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 7215873..992197b 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -121,8 +121,8 @@ function interfaces_bridge_configure() {
         global $config;
 
         $i = 0;
-        if (is_array($config['bridges']['bridge']) && count($config['bridges']['bridge'])) {
-                foreach ($config['bridges']['bridge'] as $bridge) {
+        if (is_array($config['bridges']['bridged']) && count($config['bridges']['bridged'])) {
+                foreach ($config['bridges']['bridged'] as $bridge) {
                         if(empty($bridge['bridgeif'])) {
                                 $bridge['bridgeif'] = "bridge{$i}";
                         }
diff --git a/etc/inc/xmlparse.inc b/etc/inc/xmlparse.inc
index 93a6c0b..fc74f3c 100644
--- a/etc/inc/xmlparse.inc
+++ b/etc/inc/xmlparse.inc
@@ -36,7 +36,7 @@ function listtags() {
 		"earlyshellcmd encryption-algorithm-option field fieldname hash-algorithm-option " .
 		"hosts group member interface_array item key lbpool menu mobilekey monitor_type mount onetoone option ppp package passthrumac phase1 phase2 priv proxyarpnet " .
 		"queue pages pipe route row rule schedule service servernat servers serversdisabled earlyshellcmd shellcmd staticmap subqueue " .
-		"timerange tunnel user authserver vip virtual_server vlan winsserver ntpserver wolentry widget depends_on_package gateway_item gateway_group dyndns dnsupdate gre gif bridge lagg");
+		"timerange tunnel user authserver vip virtual_server vlan winsserver ntpserver wolentry widget depends_on_package gateway_item gateway_group dyndns dnsupdate gre gif bridged lagg");
 	return $ret;
 }
 
-- 
cgit v1.1