summaryrefslogtreecommitdiffstats
path: root/etc/inc/pfsense-utils.inc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-04-16 12:13:26 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-04-16 12:13:26 -0300
commiteee053fe10fe2857f7a6921f893d66a86f090b92 (patch)
tree15d4fb8d93255e784fe604101e143e9df2032ec6 /etc/inc/pfsense-utils.inc
parent656b7f0a63f956576ab6db5d11e9fe9074c73e50 (diff)
downloadpfsense-eee053fe10fe2857f7a6921f893d66a86f090b92.zip
pfsense-eee053fe10fe2857f7a6921f893d66a86f090b92.tar.gz
Remove boot_serial='yes' from loader.conf when serial is disabled, error introduced by me on commit 986e77a2eab
Diffstat (limited to 'etc/inc/pfsense-utils.inc')
-rw-r--r--etc/inc/pfsense-utils.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 7ee8b09..0da31f0 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1069,11 +1069,12 @@ function setup_serial_port($when="save", $path="") {
}
}
- $new_boot_config[] = 'boot_serial="YES"';
if ($serial_only === true) {
+ $new_boot_config[] = 'boot_serial="YES"';
$new_boot_config[] = 'console="comconsole"';
} else if (is_serial_enabled()) {
$new_boot_config[] = 'boot_multicons="YES"';
+ $new_boot_config[] = 'boot_serial="YES"';
$primaryconsole = isset($g['primaryconsole_force']) ? $g['primaryconsole_force'] : $config['system']['primaryconsole'];
switch ($primaryconsole) {
case "video":
OpenPOWER on IntegriCloud