From 232c07a79cc1a493987cf5d7949b28590511b049 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Wed, 28 Nov 2007 02:19:27 +0000 Subject: Move special case fixes before we return so that it can be processed. --- etc/inc/config.inc | 24 ++++++++++++------------ 1 file 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']}"); } -- cgit v1.1