From 4ff3adec7a6bdd6d87cc5eeae2b1039954ee5ce2 Mon Sep 17 00:00:00 2001 From: Luiz Souza Date: Thu, 14 Sep 2017 22:04:40 -0500 Subject: If /boot/loader.conf is not presetn check /boot/loader.conf.local. --- src/etc/inc/pfsense-utils.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/etc/inc/pfsense-utils.inc') 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(); -- cgit v1.1