mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always run additional_config_upgrade() and do it after config is written

Browse Source
This commit is contained in:
Renato Botelho 2017-08-16 10:40:03 -03:00
parent df662ac417
commit dfbc4c2292
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/etc/inc/config.lib.inc
View File

@ -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