diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2007-02-09 18:32:46 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2007-02-09 18:32:46 +0000 |
| commit | c11bd851685087e440cf7c60fccde8ad782b5149 (patch) | |
| tree | 571c7d407b1299e9447b12312373ac6580a2c037 /etc | |
| parent | 50e0d2a1114e7802343ad9d95cdd265b130392d1 (diff) | |
| download | pfsense-c11bd851685087e440cf7c60fccde8ad782b5149.zip pfsense-c11bd851685087e440cf7c60fccde8ad782b5149.tar.gz | |
Sync config upgrade code with HEAD
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/config.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index bb0ce0f..ed48bb6 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -914,6 +914,13 @@ function convert_config() { } /* Convert 2.6 -> 2.7 */ + if ($config['version'] <= 2.6) { + $config['interfaces']['wan']['use_rrd_gateway'] = $config['system']['use_rrd_gateway']; + unset($config['system']['use_rrd_gateway']); + $config['version'] = "2.7"; + } + + /* Convert 2.7 -> 2.8 */ if ($config['version'] <= 2.7) { $founditem = false; foreach($config['cron']['item'] as $cronitem) { @@ -934,7 +941,7 @@ function convert_config() { $config['version'] = "2.8"; } - /* Convert 2.7 -> 2.8 */ + /* Convert 2.8 -> 2.9 */ if ($config['version'] <= 2.7) { $rule_item = array(); $a_filter = &$config['filter']['rule']; |
