Fix VLAN upgrade code properly. That's what I get for blind coding.

Testing bridging code now

1 files changed, 4 insertions, 7 deletions

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 472bfdc..1df3e8c 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -589,7 +589,7 @@ function upgrade_037_to_038() {
 	/* This should only be valid when upgrading bridges from a 1.2 config */
 	$a_bridges = array();
 	$counter = 0;
-	foreach($config['interfaces'] as $interface => $name) {
+	foreach($config['interfaces'] as $name => $interface ) {
 		if($interface['bridge'] <> "") {
 			$bridge = array();
 			$bridge['members'] = "{$name},{$interface['bridge']}";
@@ -620,15 +620,12 @@ function upgrade_038_to_039() {
 
 	/* This should only be valid when upgrading vlans from a 1.2 config though */
 	/* Vlan upgrade code. Since we now create vlans with a vlanif tag we just start at 0 */
-	$a_vlans = array();
 	$vlan_counter = 0;
-	if (is_array($config['vlans'])) {
-		foreach ($config['vlans'] as $vlan) {
-			$a_vlans[$vlan_counter] = $vlan;
-			$a_vlans[$vlan_counter]['vlanif'] = "vlan{$vlan_counter}";
+	if (is_array($config['vlans']['vlan'])) {
+		foreach ($config['vlans']['vlan'] as $vlan) {
+			$config['vlans']['vlan'][$vlan_counter]['vlanif'] = "vlan{$vlan_counter}";
 			$vlan_counter++;
 		}
-		$config['vlans'] = $a_vlans;
 	}
 }