summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2007-11-28 02:19:27 +0000
committerScott Ullrich <sullrich@pfsense.org>2007-11-28 02:19:27 +0000
commit232c07a79cc1a493987cf5d7949b28590511b049 (patch)
treef8301de8919887e15c98d8a700ced171293477ff
parent0a59d44cc67ca53d5b29a2e7d91829b416ba66d9 (diff)
downloadpfsense-232c07a79cc1a493987cf5d7949b28590511b049.zip
pfsense-232c07a79cc1a493987cf5d7949b28590511b049.tar.gz
Move special case fixes before we return so that it can be processed.
-rw-r--r--etc/inc/config.inc24
1 files changed, 12 insertions, 12 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 42292e1..daf38ca 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -486,6 +486,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 */
@@ -1134,18 +1146,6 @@ function convert_config() {
}
- /* 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']}");
}
OpenPOWER on IntegriCloud