diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-07-01 13:37:05 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-07-01 13:37:05 -0300 |
| commit | 6f9a191d76aa837d727fe047c67aae5829fede16 (patch) | |
| tree | 621f0119d24728fc670dae9380e83f803be5dc88 | |
| parent | 7f394d3e22ec47191fdf4565753599b8f69c82ad (diff) | |
| download | pfsense-6f9a191d76aa837d727fe047c67aae5829fede16.zip pfsense-6f9a191d76aa837d727fe047c67aae5829fede16.tar.gz | |
Change default console from cons25 to xterm, while I'm here, simplify the check
| -rw-r--r-- | root/.profile | 2 | ||||
| -rw-r--r-- | root/.shrc | 2 | ||||
| -rwxr-xr-x | tmp/post_upgrade_command | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/root/.profile b/root/.profile index 2252b5f..cf2ea6a 100644 --- a/root/.profile +++ b/root/.profile @@ -1,5 +1,5 @@ # Detect interactive logins and display the shell -if [ `env | grep SSH_TTY | wc -l` -gt 0 ] || [ `env | grep cons25 | wc -l` -gt 0 ]; then +if [ -n "${SSH_TTY}" -o "${TERM}" = "xterm" ]; then /etc/rc.initial exit fi @@ -1,5 +1,5 @@ # Detect interactive logins and display the shell -if [ `env | grep SSH_TTY | wc -l` -gt 0 ] || [ `env | grep cons25 | wc -l` -gt 0 ]; then +if [ -n "${SSH_TTY}" -o "${TERM}" = "xterm" ]; then /etc/rc.initial exit fi diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command index d5577f7..d5fc582 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" = "cons25" ] && exec /etc/rc.initial' +detect_command='[ -n "$SSH_TTY" -o "$TERM" = "xterm" ] && exec /etc/rc.initial' echo "$detect_command" > $CVS_CO_DIR/root/.shrc echo "$detect_command" >> $CVS_CO_DIR/root/.profile |
