diff options
author | Luiz Souza <luiz@netgate.com> | 2017-09-14 22:04:40 -0500 |
---|---|---|
committer | Luiz Souza <luiz@netgate.com> | 2017-09-14 22:06:53 -0500 |
commit | b98f6074ad2c2f7c2153eabe8a4cdc9c35261004 (patch) | |
tree | df11ed57f4eed8e3a437a3537e6ea552debd9bcc /src/etc/inc | |
parent | 793dc52dc94978f125d0028da7539cb77dca91f4 (diff) | |
download | pfsense-b98f6074ad2c2f7c2153eabe8a4cdc9c35261004.zip pfsense-b98f6074ad2c2f7c2153eabe8a4cdc9c35261004.tar.gz |
If /boot/loader.conf is not presetn check /boot/loader.conf.local.
(cherry picked from commit 4ff3adec7a6bdd6d87cc5eeae2b1039954ee5ce2)
Diffstat (limited to 'src/etc/inc')
-rw-r--r-- | src/etc/inc/pfsense-utils.inc | 9 |
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(); |