Project

General

Profile

Download (2.96 KB)

Bug #15157 » 1147.diff

Steve Wheeler, 04/03/2024 05:57 PM

View differences:

src/etc/inc/config.lib.inc
$last_backup = discover_last_backup();
if ($last_backup) {
log_error(gettext("No config.xml found, attempting last known config restore."));
file_notice("config.xml", gettext("No config.xml found, attempting last known config restore."), "pfSenseConfigurator", "");
file_notice("config.xml", gettext("No config.xml found, attempting last known config restore."), "pfSenseConfigurator", "", 1, true);
restore_backup("{$g['conf_path']}/backup/{$last_backup}");
} else {
unlock($lockkey);
......
echo ".";
}
log_error("No config.xml found, attempting last known config restore.");
file_notice("config.xml", "No config.xml found, attempting last known config restore.", "pfSenseConfigurator", "");
file_notice("config.xml", "No config.xml found, attempting last known config restore.", "pfSenseConfigurator", "", 1, true);
$last_backup = discover_last_backup();
if ($last_backup) {
restore_backup("/cf/conf/backup/{$last_backup}");
......
//pfSense_fsync($g['conf_path']);
disable_security_checks();
log_error(sprintf(gettext('%1$s is restoring the configuration %2$s'), g_get('product_label'), $file));
file_notice("config.xml", sprintf(gettext('%1$s is restoring the configuration %2$s'), g_get('product_label'), $file), "pfSenseConfigurator", "");
file_notice("config.xml", sprintf(gettext('%1$s is restoring the configuration %2$s'), g_get('product_label'), $file), "pfSenseConfigurator", "", 1, true);
}
}
......
$last_backup = discover_last_backup();
if ($last_backup) {
log_error("No config.xml found, attempting last known config restore.");
file_notice("config.xml", gettext("No config.xml found, attempting last known config restore."), "pfSenseConfigurator", "");
file_notice("config.xml", gettext("No config.xml found, attempting last known config restore."), "pfSenseConfigurator", "", 1, true);
restore_backup("/cf/conf/backup/{$last_backup}");
}
if (!file_exists("{$g['conf_path']}/config.xml")) {
......
$last_backup = discover_last_backup();
if ($last_backup) {
log_error(gettext("No config.xml found, attempting last known config restore."));
file_notice("config.xml", gettext("No config.xml found, attempting last known config restore."), "pfSenseConfigurator", "");
file_notice("config.xml", gettext("No config.xml found, attempting last known config restore."), "pfSenseConfigurator", "", 1, true);
restore_backup("{$g['conf_path']}/backup/{$last_backup}");
} else {
unlock($lockkey);
(2-2/2)