]> code.ossystems Code Review - openembedded-core.git/commitdiff
base-files: restrict resize to run on serial consoles only in profile │·
authorbavery <brian.avery@intel.com>
Tue, 9 Aug 2016 00:20:32 +0000 (17:20 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 10 Aug 2016 09:45:33 +0000 (10:45 +0100)
We don't need/wan't to run resize on an ssh connection. It's useless and
it breaks the Eclipse SSH debug connection. So, we added a check.

YOCTO #9362

Signed-off-by: bavery <brian.avery@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-core/base-files/base-files/profile

index e98e786b12360e8c97719b4a46c3b50d579b0314..ba1b9ba1564d1a2da15ec6f84cb043cd31a768c8 100644 (file)
@@ -6,7 +6,7 @@ EDITOR="vi"                     # needed for packages like cron, git-commit
 test -z "$TERM" && TERM="vt100"        # Basic terminal capab. For screen etc.
 
 if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then
-       TZ="UTC"                # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
+       TZ="UTC"                # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html
                                # for an explanation of how to set this to your local timezone.
        export TZ
 fi
@@ -29,10 +29,11 @@ if [ -d /etc/profile.d ]; then
 fi
 
 if [ -x /usr/bin/resize ];then
-  /usr/bin/resize >/dev/null
+  # Make sure we are on a serial console (i.e. the device used starts with /dev/tty),
+  # otherwise we confuse e.g. the eclipse launcher which tries do use ssh
+  test `tty | cut -c1-8` = "/dev/tty" && resize >/dev/null
 fi
 
 export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
 
 umask 022
-