summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2012-07-06 12:29:38 -0400
committerjim-p <jimp@pfsense.org>2012-07-06 12:29:38 -0400
commit409bc1bdb34d6469c97259b1af614fcdd45f7122 (patch)
tree80771ad62a05b64e2fd1d5c9de4a0fe56879317a
parent3a819be7357290aad46b57d0b526e0cd0220abba (diff)
downloadpfsense-409bc1bdb34d6469c97259b1af614fcdd45f7122.zip
pfsense-409bc1bdb34d6469c97259b1af614fcdd45f7122.tar.gz
Fixup serial console settings that get applied to nanobsd. Fixes #2484
-rw-r--r--etc/inc/pfsense-utils.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index e1182ad..3e5fa24 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -956,7 +956,7 @@ function setup_serial_port($when="save", $path="") {
else
$boot_config = "";
- if($g['platform'] <> "cdrom") {
+ if(($g['platform'] != "cdrom") && ($g['platform'] != "nanobsd")) {
$boot_config_split = explode("\n", $boot_config);
$fd = fopen($boot_config_file,"w");
if($fd) {
@@ -973,6 +973,8 @@ function setup_serial_port($when="save", $path="") {
}
fclose($fd);
}
+ }
+ if($g['platform'] != "cdrom") {
/* serial console - write out /boot/loader.conf */
$boot_config = file_get_contents($loader_conf_file);
$boot_config_split = explode("\n", $boot_config);
OpenPOWER on IntegriCloud