diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-07-02 17:18:47 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-07-02 17:24:25 -0300 |
commit | d4b1e549c259c4a2be50d92fe8de65b72b7263bb (patch) | |
tree | 4a1b9741406cf0f91b6e93db9396b46c4f134c65 /etc | |
parent | 23c01a69fe1e922d1c6f670cfdc76ef415c23484 (diff) | |
download | pfsense-d4b1e549c259c4a2be50d92fe8de65b72b7263bb.zip pfsense-d4b1e549c259c4a2be50d92fe8de65b72b7263bb.tar.gz |
Back to cons25 for now since we found some issues with xterm on serial console
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/pfsense-utils.inc | 4 | ||||
-rwxr-xr-x | etc/rc.bootup | 10 | ||||
-rwxr-xr-x | etc/rc.initial | 2 | ||||
-rw-r--r-- | etc/ttys | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index d16a2f0..56d85f2 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -990,9 +990,9 @@ function setup_serial_port($when="save", $path="") { } foreach($ttys_split as $tty) { if (stristr($tty, "ttyv0")) - fwrite($fd, "ttyv0 \"/usr/libexec/getty {$console_type}\" xterm on secure\n"); + 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}\" xterm {$on_off} secure\n"); + fwrite($fd, "ttyu0 \"/usr/libexec/getty {$serial_type}\" cons25 {$on_off} secure\n"); else fwrite($fd, $tty . "\n"); } diff --git a/etc/rc.bootup b/etc/rc.bootup index 265effb..815480a 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -61,19 +61,19 @@ function rescue_detect_keypress() { } // If R or I was pressed do our logic here if (in_array($key, array("r", "R"))) { - putenv("TERM=xterm"); + putenv("TERM=cons25"); echo "\n\nRecovery mode selected...\n"; - passthru("/usr/bin/env TERM=xterm /bin/tcsh -c /scripts/lua_installer_rescue"); + passthru("/usr/bin/env TERM=cons25 /bin/tcsh -c /scripts/lua_installer_rescue"); } elseif (in_array($key, array("i", "I"))) { - putenv("TERM=xterm"); + putenv("TERM=cons25"); echo "\n\nInstaller mode selected...\n"; - passthru("/usr/bin/env TERM=xterm /bin/tcsh -c /scripts/lua_installer"); + passthru("/usr/bin/env TERM=cons25 /bin/tcsh -c /scripts/lua_installer"); if(file_exists("/tmp/install_complete")) { passthru("/etc/rc.reboot"); exit; } } elseif (in_array($key, array("!", "~"))) { - putenv("TERM=xterm"); + putenv("TERM=cons25"); echo "\n\nRecovery shell selected...\n"; echo "\n"; touch("/tmp/donotbootup"); diff --git a/etc/rc.initial b/etc/rc.initial index 6b9885e..03d9131 100755 --- a/etc/rc.initial +++ b/etc/rc.initial @@ -161,7 +161,7 @@ case ${opmode} in ;; 99) if [ -e /dev/ukbd0 ]; then - env TERM=xterm /scripts/lua_installer + env TERM=cons25 /scripts/lua_installer else /scripts/lua_installer fi @@ -29,7 +29,7 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty al.Pc" xterm on secure +ttyv0 "/usr/libexec/getty al.Pc" cons25 on secure # Virtual terminals ttyv1 "/usr/libexec/getty Pc" xterm off secure ttyv2 "/usr/libexec/getty Pc" xterm off secure @@ -41,7 +41,7 @@ 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" xterm on secure +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 |