summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/pfsense-utils.inc
diff options
context:
space:
mode:
authorLuiz Souza <luiz@netgate.com>2017-09-14 22:04:40 -0500
committerLuiz Souza <luiz@netgate.com>2017-09-14 22:06:01 -0500
commit4ff3adec7a6bdd6d87cc5eeae2b1039954ee5ce2 (patch)
tree06b054ee8c0a44edd56271bc75c57aeada8ae634 /src/etc/inc/pfsense-utils.inc
parent59104a6ff6c862482eddb9696fd8d22dec89052e (diff)
downloadpfsense-4ff3adec7a6bdd6d87cc5eeae2b1039954ee5ce2.zip
pfsense-4ff3adec7a6bdd6d87cc5eeae2b1039954ee5ce2.tar.gz
If /boot/loader.conf is not presetn check /boot/loader.conf.local.
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