Commit 9d6a8690 authored by Ad Schellevis's avatar Ad Schellevis

cleanup config

parent 70027a0f
...@@ -135,17 +135,6 @@ else if (file_exists("/var/run/booting") && !file_exists('/conf/config.xml')) { ...@@ -135,17 +135,6 @@ else if (file_exists("/var/run/booting") && !file_exists('/conf/config.xml')) {
} }
} }
} }
if (!$cfgdevice) {
$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", "");
restore_backup("/conf/backup/{$last_backup}");
} else {
log_error(gettext("No config.xml or config backups found, resetting to factory defaults."));
restore_backup('/usr/local/etc/config.xml');
}
}
/* write device name to a file for rc.firmware */ /* write device name to a file for rc.firmware */
$fd = fopen("{$g['varetc_path']}/cfdevice", "w"); $fd = fopen("{$g['varetc_path']}/cfdevice", "w");
...@@ -173,11 +162,5 @@ if (!$timezone) ...@@ -173,11 +162,5 @@ if (!$timezone)
$timezone = "Etc/UTC"; $timezone = "Etc/UTC";
date_default_timezone_set("$timezone"); date_default_timezone_set("$timezone");
if($config_parsed == true) {
/* process packager manager custom rules */
if(is_dir("/usr/local/pkg/parse_config")) {
run_plugins("/usr/local/pkg/parse_config/");
}
}
?> ?>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment