mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Testing bridging code now
This commit is contained in:
Seth Mos 2009-06-08 14:39:08 +02:00
parent fcf5afa07b
commit dbaa0e3402
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/inc/upgrade_config.inc
View File

@ -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;
}
}