diff options
author | Seth Mos <seth.mos@xs4all.nl> | 2009-06-08 15:18:03 +0200 |
---|---|---|
committer | Seth Mos <seth.mos@xs4all.nl> | 2009-06-08 15:18:03 +0200 |
commit | c11ba0d22eabe84d7f950072a75d1a552c24fba1 (patch) | |
tree | 8ae7df726a7c0931afcb76635bcc307c177f32b8 /etc/inc | |
parent | dbaa0e34026593632dad86fe310f7c797da3a79f (diff) | |
download | pfsense-c11ba0d22eabe84d7f950072a75d1a552c24fba1.zip pfsense-c11ba0d22eabe84d7f950072a75d1a552c24fba1.tar.gz |
Fix bridge upgrade code.
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 1df3e8c..40e56d6 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 $name => $interface ) { + foreach($config['interfaces'] as $name => & $interface ) { if($interface['bridge'] <> "") { $bridge = array(); $bridge['members'] = "{$name},{$interface['bridge']}"; @@ -605,8 +605,6 @@ function upgrade_037_to_038() { $bridge['ifpriority'] = ""; $bridge['ifpathcost'] = ""; $bridge['bridgeif'] = "bridge{$counter}"; - /* done collecting info, have to burn those bridges */ - $config['interfaces'][$name]['bridge'] = true; $a_bridges[$counter] = $bridge; $counter++; } |