summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2012-09-04 16:38:20 -0400
committerjim-p <jimp@pfsense.org>2012-09-04 16:38:20 -0400
commit4c9e22b9bbd3397b1b25f6123ca74b861580223d (patch)
tree3fc98cec2f159dd35d040ef80a31828c702bb8a3 /etc
parent744306c6bd08b506c22d16214b6e479936b4857c (diff)
downloadpfsense-4c9e22b9bbd3397b1b25f6123ca74b861580223d.zip
pfsense-4c9e22b9bbd3397b1b25f6123ca74b861580223d.tar.gz
Add another test here for Nano+VGA to preserve the console selection.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/pfsense-utils.inc10
1 files changed, 8 insertions, 2 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index ff813f0..9f31a49 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -998,8 +998,14 @@ function setup_serial_port($when="save", $path="") {
$new_boot_config[] = 'comconsole_speed="' . $serialspeed . '"';
$new_boot_config[] = 'console="comconsole,vidconsole"';
} elseif ($g['platform'] == "nanobsd") {
- $new_boot_config[] = 'comconsole_speed="' . $serialspeed . '"';
- $new_boot_config[] = 'console="comconsole"';
+ if (file_exists("/etc/nano_use_vga.txt")) {
+ $new_boot_config[] = 'boot_multicons="YES"';
+ $new_boot_config[] = 'comconsole_speed="' . $serialspeed . '"';
+ $new_boot_config[] = 'console="vidconsole,comconsole"';
+ } else {
+ $new_boot_config[] = 'comconsole_speed="' . $serialspeed . '"';
+ $new_boot_config[] = 'console="comconsole"';
+ }
}
file_put_contents($loader_conf_file, implode("\n", $new_boot_config) . "\n");
}
OpenPOWER on IntegriCloud