summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorLuiz Souza <luiz@netgate.com>2018-09-14 16:59:07 -0300
committerLuiz Souza <luiz@netgate.com>2018-09-14 17:01:44 -0300
commit9c614946f8fa04d7aa5b0c5136a90f2ef6677d27 (patch)
tree7350d92fd01dcff6f5a4d33d7b146e5454e7aaf5 /src/etc
parent6b3bff7437ff98d1d5f1dcaa0afce67105588efd (diff)
downloadpfsense-9c614946f8fa04d7aa5b0c5136a90f2ef6677d27.zip
pfsense-9c614946f8fa04d7aa5b0c5136a90f2ef6677d27.tar.gz
Always pass the $local variabled to load_loader_conf(), it makes the code easier to read.
(cherry picked from commit 1ef4cbdbb03791f5c3541df44da5a61d00db6e46)
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/pfsense-utils.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index ac89a6a..0a26e24 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -1246,7 +1246,7 @@ function setup_loader_settings($path = "", $upgrade = false) {
system("echo \"Reading {$loader_conf_file}...\" >> /conf/upgrade_log.txt");
}
- $data = load_loader_conf($loader_conf_file);
+ $data = load_loader_conf($loader_conf_file, false);
if ($serial_only === true) {
$data[] = 'boot_serial="YES"';
$data[] = 'console="comconsole"';
OpenPOWER on IntegriCloud