1 files changed, 41 insertions, 7 deletions

diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
index 9e4283e0c7..cc37e1ba77 100644
--- a/meta/recipes-core/base-files/base-files/profile
+++ b/meta/recipes-core/base-files/base-files/profile
@@ -2,7 +2,6 @@
 # and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
 
 PATH="/usr/local/bin:/usr/bin:/bin"
-EDITOR="vi"                     # needed for packages like cron, git-commit
 [ "$TERM" ] || TERM="vt100"     # Basic terminal capab. For screen etc.
 
 # Add /sbin & co to $PATH for the root user
@@ -20,13 +19,48 @@ if [ -d /etc/profile.d ]; then
         unset i
 fi
 
-# Make sure we are on a serial console (i.e. the device used starts with
-# /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which tries do
-# use ssh
-case $(tty 2>/dev/null) in
-        /dev/tty[A-z]*) [ -x @BINDIR@/resize ] && @BINDIR@/resize >/dev/null;;
-esac
+if [ -t 0 -a $# -eq 0 ]; then
+        if [ ! -x @BINDIR@/resize ] ; then
+                if [ -n "$BASH_VERSION" ] ; then
+# Optimized resize funciton for bash
+resize() {
+        local x y
+        IFS='[;' read -t 2 -p $(printf '\e7\e[r\e[999;999H\e[6n\e8') -sd R _ y x _
+        [ -n "$y" ] && \
+        echo -e "COLUMNS=$x;\nLINES=$y;\nexport COLUMNS LINES;" && \
+        stty cols $x rows $y
+}
+                else
+# Portable resize function for ash/bash/dash/ksh
+# with subshell to avoid local variables
+resize() {
+        (o=$(stty -g)
+        stty -echo raw min 0 time 2
+        printf '\0337\033[r\033[999;999H\033[6n\0338'
+        if echo R | read -d R x 2> /dev/null; then
+                IFS='[;R' read -t 2 -d R -r z y x _
+        else
+                IFS='[;R' read -r _ y x _
+        fi
+        stty "$o"
+        [ -z "$y" ] && y=${z##*[}&&x=${y##*;}&&y=${y%%;*}
+        [ -n "$y" ] && \
+        echo "COLUMNS=$x;"&&echo "LINES=$y;"&&echo "export COLUMNS LINES;"&& \
+        stty cols $x rows $y)
+}
+                fi
+        fi
+        # Use the EDITOR not being set as a trigger to call resize
+        # and only do this for /dev/tty[A-z] which are typically
+        # serial ports
+        if [ -z "$EDITOR" -a "$SHLVL" = 1 ] ; then
+                case $(tty 2>/dev/null) in
+                        /dev/tty[A-z]*) resize >/dev/null;;
+                esac
+        fi
+fi
 
+EDITOR="vi"                     # needed for packages like cron, git-commit
 export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
 
 umask 022