diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2007-10-15 21:11:04 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2007-10-15 21:11:04 +0000 |
| commit | b0e2fb1038f7ac1c993b0ae24eececce1c893efa (patch) | |
| tree | 3547d16ad2fd4ef7281fa1b4cc878685ac19822b /etc | |
| parent | aa0b6f361773171929f5ee0629a35e0174f550f7 (diff) | |
| download | pfsense-b0e2fb1038f7ac1c993b0ae24eececce1c893efa.zip pfsense-b0e2fb1038f7ac1c993b0ae24eececce1c893efa.tar.gz | |
Move RRD upgrade code inline with 1.2
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/config.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 7f5c566..7857985 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -997,7 +997,14 @@ function convert_config() { $config['version'] = "2.9"; } - /* Convert 2.9 -> 4.0 */ + /* Convert 2.9 -> 3.0 */ + if ($config['version'] <= 2.9) { + /* enable the rrd config setting by default */ + $config['rrd']['enable'] = true; + $config['version'] = "3.0"; + } + + /* Convert 3.0 -> 4.0 */ if ($config['version'] <= 3.9) { $config['system']['webgui']['auth_method'] = "session"; $config['system']['webgui']['backing_method'] = "htpasswd"; @@ -1127,13 +1134,6 @@ function convert_config() { } - /* Convert 4.1 -> 4.2 */ - if ($config['version'] <= 4.1) { - /* enable the rrd config setting by default */ - $config['rrd']['enable'] = true; - $config['version'] = "4.2"; - } - if ($prev_version != $config['version']) write_config("Upgraded config version level from {$prev_version} to {$config['version']}"); } @@ -1979,4 +1979,4 @@ function set_device_perms() { if($g['booting']) echo "."; $config = parse_config(); -?>
\ No newline at end of file +?> |
