diff options
author | Seth Mos <seth.mos@xs4all.nl> | 2009-06-08 15:20:13 +0200 |
---|---|---|
committer | Seth Mos <seth.mos@xs4all.nl> | 2009-06-08 15:20:13 +0200 |
commit | db7f618ba9df5a1e7ef535d5e20567273a635e4b (patch) | |
tree | 34af601079cf4746771df668731fc6d1d89405d7 /etc | |
parent | c11ba0d22eabe84d7f950072a75d1a552c24fba1 (diff) | |
download | pfsense-db7f618ba9df5a1e7ef535d5e20567273a635e4b.zip pfsense-db7f618ba9df5a1e7ef535d5e20567273a635e4b.tar.gz |
Yank bridge upgrade function as it appears to be a duplicate. I should have checked before making one. Oh well.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 40e56d6..fdb3af1 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -585,31 +585,7 @@ function upgrade_036_to_037() { function upgrade_037_to_038() { global $config; - - /* This should only be valid when upgrading bridges from a 1.2 config */ - $a_bridges = array(); - $counter = 0; - foreach($config['interfaces'] as $name => & $interface ) { - if($interface['bridge'] <> "") { - $bridge = array(); - $bridge['members'] = "{$name},{$interface['bridge']}"; - $bridge['descr'] = "Upgraded from 1.2"; - $bridge['maxaddr'] = ""; - $bridge['timeout'] = ""; - $bridge['maxage'] = ""; - $bridge['fwdelay'] = ""; - $bridge['hellotime'] = ""; - $bridge['priority'] = ""; - $bridge['proto'] = "rstp"; - $bridge['holdcount'] = ""; - $bridge['ifpriority'] = ""; - $bridge['ifpathcost'] = ""; - $bridge['bridgeif'] = "bridge{$counter}"; - $a_bridges[$counter] = $bridge; - $counter++; - } - } - $config['bridges'] = $a_bridges; + /* Insert upgrade code here */ } |