diff options
author | Renato Botelho <renato@netgate.com> | 2017-08-16 10:40:03 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2017-08-16 11:03:13 -0300 |
commit | dfbc4c22929f3556bd8341d5dc3e32681caeeb8d (patch) | |
tree | a28d081db9345909e3a393c111c70657c11c0b38 /src/etc | |
parent | df662ac41702c25f676599b1b4459ffa4c09b358 (diff) | |
download | pfsense-dfbc4c22929f3556bd8341d5dc3e32681caeeb8d.zip pfsense-dfbc4c22929f3556bd8341d5dc3e32681caeeb8d.tar.gz |
Always run additional_config_upgrade() and do it after config is written
Diffstat (limited to 'src/etc')
-rw-r--r-- | src/etc/inc/config.lib.inc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 80e212d..9d8615b 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -438,9 +438,6 @@ function convert_config() { } } } - if ($config['version'] == $g['latest_config']) { - return; /* already at latest version */ - } // Save off config version $prev_version = $config['version']; @@ -451,6 +448,11 @@ function convert_config() { include_once("upgrade_config_custom.inc"); } + if ($config['version'] == $g['latest_config']) { + additional_config_upgrade(); + return; /* already at latest version */ + } + if (!is_array($config['system']['already_run_config_upgrade'])) { $config['system']['already_run_config_upgrade'] = array(); } @@ -481,14 +483,14 @@ function convert_config() { } } - additional_config_upgrade(); - - $now = date("H:i:s"); - log_error(sprintf(gettext("Ended Configuration upgrade at %s"), $now)); - if ($prev_version != $config['version']) { + $now = date("H:i:s"); + log_error(sprintf(gettext("Ended Configuration upgrade at %s"), $now)); + write_config(sprintf(gettext('Upgraded config version level from %1$s to %2$s'), $prev_version, $config['version'])); } + + additional_config_upgrade(); } /****f* config/safe_write_file |