summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-12-23 20:11:19 +0000
committerErmal <eri@pfsense.org>2010-12-23 20:11:19 +0000
commit1916d34a1bba91760b1e80b41ad166bbebe99466 (patch)
tree9bd5b8ff29023028ab751a788466b32d79e59311 /etc
parent5af3a589353d9b1cbdb8097e03c75a842043f3d0 (diff)
downloadpfsense-1916d34a1bba91760b1e80b41ad166bbebe99466.zip
pfsense-1916d34a1bba91760b1e80b41ad166bbebe99466.tar.gz
Instead of replacing the whole array just add the new vlanif member to the config. Should fix issues reported in http://forum.pfsense.org/index.php/topic,28202.15.html
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/upgrade_config.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 58e5ca2..58b613b 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -817,8 +817,7 @@ function upgrade_044_to_045() {
$iflist = get_configured_interface_list(false, true);
if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
foreach ($config['vlans']['vlan'] as $id => $vlan) {
- $vlan['vlanif'] = "{$vlan['if']}_vlan{$vlan['tag']}";
- $config['vlans']['vlan'][$id] = $vlan;
+ $config['vlans']['vlan'][$id]['vlanif'] = "{$vlan['if']}_vlan{$vlan['tag']}";
/* Make sure to update the interfaces section with the right name */
foreach($iflist as $ifname) {
if($config['interfaces'][$ifname]['if'] == "vlan{$id}") {
@@ -2282,4 +2281,4 @@ function upgrade_074_to_075() {
rename_field($config['crl'], 'name', 'descr');
}
-?> \ No newline at end of file
+?>
OpenPOWER on IntegriCloud