From a7401ce73a2851a1099c89a61a57e180f02ceac3 Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lotheac@iki.fi>
Date: Tue, 17 Jan 2012 10:32:09 +0200
Subject: Clean up .profile and .shrc

---
 tmp/post_upgrade_command | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'tmp')

diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command
index 1db2799..393cd68 100755
--- a/tmp/post_upgrade_command
+++ b/tmp/post_upgrade_command
@@ -33,14 +33,9 @@ if [ $PFSENSETYPE = "pfSense" ] || [ $PFSENSETYPE = "nanobsd" ]; then
 fi
 
 # Detect interactive logins and display the shell
-echo "if [ \`env | grep SSH_TTY | wc -l\` -gt 0 ] || [ \`env | grep cons25 | wc -l\` -gt 0 ]; then" > $CVS_CO_DIR/root/.shrc
-echo "        /etc/rc.initial" >> $CVS_CO_DIR/root/.shrc
-echo "        exit" >> $CVS_CO_DIR/root/.shrc
-echo "fi" >> $CVS_CO_DIR/root/.shrc
-echo "if [ \`env | grep SSH_TTY | wc -l\` -gt 0 ] || [ \`env | grep cons25 | wc -l\` -gt 0 ]; then" >> $CVS_CO_DIR/root/.profile
-echo "        /etc/rc.initial" >> $CVS_CO_DIR/root/.profile
-echo "        exit" >> $CVS_CO_DIR/root/.profile
-echo "fi" >> $CVS_CO_DIR/root/.profile
+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
 
 # Now turn on or off serial console as needed
 /tmp/post_upgrade_command.php $1
-- 
cgit v1.1