diff options
author | smos <seth.mos@dds.nl> | 2011-02-24 15:23:12 +0100 |
---|---|---|
committer | smos <seth.mos@dds.nl> | 2011-02-24 15:23:12 +0100 |
commit | 62958eae43864c873cbd92830d1a6bdb51746aa8 (patch) | |
tree | e0378d5afdbce80f3d9249661d79de99e5a3e76c /etc/inc/upgrade_config.inc | |
parent | 583f49135dc714e21152daa00ab99a8fd50bc2bf (diff) | |
download | pfsense-62958eae43864c873cbd92830d1a6bdb51746aa8.zip pfsense-62958eae43864c873cbd92830d1a6bdb51746aa8.tar.gz |
Correct the vlan upgrade code to continue when we fixed up the interface
Diffstat (limited to 'etc/inc/upgrade_config.inc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 8bb2c77..fa5727d 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -822,13 +822,15 @@ function upgrade_044_to_045() { if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) { $i = 0; foreach ($config['vlans']['vlan'] as $id => $vlan) { - $config['vlans']['vlan'][$i]['vlanif'] = "{$vlan['if']}_vlan{$vlan['tag']}"; /* Make sure to update the interfaces section with the right name */ + $vlan_name = "{$vlan['if']}_vlan{$vlan['tag']}"; foreach($iflist as $ifname) { if($config['interfaces'][$ifname]['if'] == "vlan{$i}") { - $config['interfaces'][$ifname]['if'] = $vlan['vlanif']; + $config['interfaces'][$ifname]['if'] = $vlan_name; + continue; } } + $config['vlans']['vlan'][$i]['vlanif'] = "{$vlan_name}"; $i++; } } |