summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/pfsense-utils.inc4
-rwxr-xr-xetc/rc.bootup10
-rwxr-xr-xetc/rc.initial2
-rw-r--r--etc/ttys4
-rw-r--r--root/.profile2
-rw-r--r--root/.shrc2
-rwxr-xr-xtmp/post_upgrade_command2
7 files changed, 13 insertions, 13 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
diff --git a/etc/ttys b/etc/ttys
index 680d878..f04ca75 100644
--- a/etc/ttys
+++ b/etc/ttys
@@ -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
diff --git a/root/.profile b/root/.profile
index cf2ea6a..700597a 100644
--- a/root/.profile
+++ b/root/.profile
@@ -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
diff --git a/root/.shrc b/root/.shrc
index cf2ea6a..700597a 100644
--- a/root/.shrc
+++ b/root/.shrc
@@ -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
diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command
index d5fc582..d5577f7 100755
--- a/tmp/post_upgrade_command
+++ b/tmp/post_upgrade_command
@@ -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
OpenPOWER on IntegriCloud