summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorBill Marquette <bill.marquette@gmail.com>2009-03-14 20:01:54 -0500
committerBill Marquette <bill.marquette@gmail.com>2009-03-14 20:03:13 -0500
commitc755c016205898f13b7c7e282f2b6a1758bb4a6f (patch)
tree796086188d555d907cb44667d11d513701236b59 /etc
parent4b805dbe77242f1c1babf5fd8678ddee8bc513dc (diff)
downloadpfsense-c755c016205898f13b7c7e282f2b6a1758bb4a6f.zip
pfsense-c755c016205898f13b7c7e282f2b6a1758bb4a6f.tar.gz
Remove duplicate config.xml and restore conf.default/config.xml if /conf/config.xml and no backups exist
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/config.inc16
1 files changed, 2 insertions, 14 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 026b90f..4f45cbd 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -167,20 +167,8 @@ if ($g['booting'] and !file_exists($g['cf_conf_path'] . "/config.xml") ) {
file_notice("config.xml", "No config.xml found, attempting last known config restore.", "pfSenseConfigurator", "");
restore_backup("/cf/conf/backup/{$last_backup}");
} else {
- /* no device found, print an error and die */
- echo <<<EOD
-
-*******************************************************************************
-* FATAL ERROR *
-* The device that contains the configuration file (config.xml) could not be *
-* found. {$g['product_name']} cannot continue booting. *
-*******************************************************************************
-
-
-EOD;
-
- mwexec("/sbin/halt");
- exit;
+ log_error("No config.xml or config backups found, resetting to factory defaults.")
+ restore_backup('/conf.default/config.xml');
}
}
OpenPOWER on IntegriCloud