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

Actually re-parse the config if a valid config was not written. (Should help stop installs from blowing up on failed config upgrades). Save the bad config for inspection, and print a message to the console about what was done.

Browse Source
This commit is contained in:
jim-p 2011-04-06 12:54:18 -04:00
parent 4c613f8482
commit 557300a7eb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/inc/config.lib.inc
View File

@ -534,10 +534,17 @@ function write_config($desc="Unknown", $backup = true) {
/* NOTE: We assume that the file can be parsed since we wrote it. */
$config = parse_xml_config("{$g['conf_path']}/config.xml", $g['xml_rootobj']);
if ($config == -1) {
copy("{$g['conf_path']}/config.xml", "{$g['conf_path']}/config.xml.bad");
$last_backup = discover_last_backup();
if ($last_backup)
if ($last_backup) {
restore_backup("/cf/conf/backup/{$last_backup}");
else
$config = parse_xml_config("{$g['conf_path']}/config.xml", $g['xml_rootobj']);
if ($g['booting']) {
echo "\n\n ************** WARNING **************";
echo "\n\n New configuration could not be validated. Restored previous configuration. \n";
echo "\n Failed configuration has been saved as {{$g['conf_path']}/config.xml.bad} \n\n";
}
} else
log_error(gettext("Could not restore config.xml."));
} else
generate_config_cache($config);