summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/pfsense-utils.inc9
-rw-r--r--etc/ttys8
2 files changed, 9 insertions, 8 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 6fbb20c..9bc94cd 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1019,7 +1019,7 @@ function setup_serial_port($when="save", $path="") {
$ttys_split = explode("\n", $ttys);
$fd = fopen($ttys_file, "w");
- $on_off = (is_serial_enabled() ? 'on' : 'off');
+ $on_off = (is_serial_enabled() ? 'onifconsole' : 'off');
if (isset($config['system']['disableconsolemenu'])) {
$console_type = 'Pc';
@@ -1031,9 +1031,10 @@ function setup_serial_port($when="save", $path="") {
foreach($ttys_split as $tty) {
if (stristr($tty, "ttyv0"))
fwrite($fd, "ttyv0 \"/usr/libexec/getty {$console_type}\" cons25 on secure\n");
- else if (stristr($tty, "ttyu0"))
- fwrite($fd, "ttyu0 \"/usr/libexec/getty {$serial_type}\" cons25 {$on_off} secure\n");
- else
+ else if (stristr($tty, "ttyu")) {
+ $ttyn = substr($tty, 0, 5);
+ fwrite($fd, "{$ttyn} \"/usr/libexec/getty {$serial_type}\" cons25 {$on_off} secure\n");
+ } else
fwrite($fd, $tty . "\n");
}
unset($on_off, $console_type, $serial_type);
diff --git a/etc/ttys b/etc/ttys
index f04ca75..382c6a7 100644
--- a/etc/ttys
+++ b/etc/ttys
@@ -41,9 +41,9 @@ ttyv7 "/usr/libexec/getty Pc" xterm off secure
ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure
# Serial terminals
# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0 "/usr/libexec/getty al.115200" cons25 on secure
-ttyu1 "/usr/libexec/getty std.9600" dialup off secure
-ttyu2 "/usr/libexec/getty std.9600" dialup off secure
-ttyu3 "/usr/libexec/getty std.9600" dialup off secure
+ttyu0 "/usr/libexec/getty al.115200" cons25 onifconsole secure
+ttyu1 "/usr/libexec/getty al.115200" cons25 onifconsole secure
+ttyu2 "/usr/libexec/getty al.115200" cons25 onifconsole secure
+ttyu3 "/usr/libexec/getty al.115200" cons25 onifconsole secure
# Dumb console
dcons "/usr/libexec/getty std.9600" vt100 off secure
OpenPOWER on IntegriCloud