diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2007-11-28 02:20:23 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2007-11-28 02:20:23 +0000 |
commit | a984fffd873d183b7fc10bb0308d56e7c060833b (patch) | |
tree | 9fa1fd26728c32c4964453507e1c6ddd15d91dad /etc/inc/config.inc | |
parent | adcda2839df762ea76392a47b6c355cdde7a85d5 (diff) | |
download | pfsense-a984fffd873d183b7fc10bb0308d56e7c060833b.zip pfsense-a984fffd873d183b7fc10bb0308d56e7c060833b.tar.gz |
Move special case fixes before we return so that it can be processed.
Diffstat (limited to 'etc/inc/config.inc')
-rw-r--r-- | etc/inc/config.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 2999b64..6850aad 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -483,6 +483,18 @@ function conf_mount_ro() { function convert_config() { global $config, $g; + /* special case upgrades */ + /* fix every minute crontab bogons entry */ + $cron_item_count = count($config['cron']['item']); + for($x=0; $x<$cron_item_count; $x++) { + if(stristr($config['cron']['item'][$x]['command'], "rc.update_bogons.sh")) { + if($config['cron']['item'][$x]['hour'] == "*" ) { + $config['cron']['item'][$x]['hour'] = "2"; + write_config("Updated bogon update frequency to 2am"); + } + } + } + if ($config['version'] == $g['latest_config']) return; /* already at latest version */ @@ -1001,18 +1013,6 @@ function convert_config() { $config['version'] = "3.0"; } - /* special case upgrades */ - /* fix every minute crontab bogons entry */ - $cron_item_count = count($config['cron']['item']); - for($x=0; $x<$cron_item_count; $x++) { - if(stristr($config['cron']['item'][$x]['command'], "rc.update_bogons.sh")) { - if($config['cron']['item'][$x]['hour'] == "*" ) { - $config['cron']['item'][$x]['hour'] = "2"; - write_config("Updated bogon update frequency to 2am"); - } - } - } - if ($prev_version != $config['version']) write_config("Upgraded config version level from {$prev_version} to {$config['version']}"); } |