summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/pfsense-utils.inc
diff options
context:
space:
mode:
Diffstat (limited to 'src/etc/inc/pfsense-utils.inc')
-rw-r--r--src/etc/inc/pfsense-utils.inc9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index ebf75c8..5f8998a 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -1164,7 +1164,14 @@ function setup_serial_port($when = "save", $path = "") {
system("echo \"Reading {$loader_conf_file}...\" >> /conf/upgrade_log.txt");
}
- $loader_conf = file_get_contents($loader_conf_file);
+ if (file_exists($loader_conf_file)) {
+ $loader_conf = file_get_contents($loader_conf_file);
+ } elseif (file_exists("{$path}/boot/loader.conf.local")) {
+ $loader_conf_file = "{$path}/boot/loader.conf.local";
+ $loader_conf = file_get_contents($loader_conf_file);
+ } else {
+ $loader_conf = "";
+ }
$loader_conf_split = explode("\n", $loader_conf);
$data = array();
OpenPOWER on IntegriCloud