entrouvert
/
univnautes
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Back to cons25 for now since we found some issues with xterm on serial console

This commit is contained in:
Renato Botelho 2014-07-02 17:18:47 -03:00
parent 23c01a69fe
commit d4b1e549c2
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/inc/pfsense-utils.inc
View File

@ -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");
}

10
etc/rc.bootup
View File

@ -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");

2
etc/rc.initial
View File

@ -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

4
etc/ttys
View File

@ -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

2
root/.profile
View File

@ -1,5 +1,5 @@
# Detect interactive logins and display the shell
if [ -n "${SSH_TTY}" -o "${TERM}" = "xterm" ]; then
if [ -n "${SSH_TTY}" -o "${TERM}" = "cons25" ]; then
/etc/rc.initial
exit
fi

2
root/.shrc
View File

@ -1,5 +1,5 @@
# Detect interactive logins and display the shell
if [ -n "${SSH_TTY}" -o "${TERM}" = "xterm" ]; then
if [ -n "${SSH_TTY}" -o "${TERM}" = "cons25" ]; then
/etc/rc.initial
exit
fi

2
tmp/post_upgrade_command
View File

@ -9,7 +9,7 @@ if [ $PFSENSETYPE = "pfSense" ] || [ $PFSENSETYPE = "nanobsd" ]; then
fi
# Detect interactive logins and display the shell
detect_command='[ -n "$SSH_TTY" -o "$TERM" = "xterm" ] && exec /etc/rc.initial'
detect_command='[ -n "$SSH_TTY" -o "$TERM" = "cons25" ] && exec /etc/rc.initial'
echo "$detect_command" > $CVS_CO_DIR/root/.shrc
echo "$detect_command" >> $CVS_CO_DIR/root/.profile