From 655778769f50d3aff74d7a436d28ac31b6aebb11 Mon Sep 17 00:00:00 2001 From: bavery Date: Mon, 8 Aug 2016 17:20:32 -0700 Subject: =?UTF-8?q?base-files:=20restrict=20resize=20to=20run=20on=20seria?= =?UTF-8?q?l=20consoles=20only=20in=20profile=20=E2=94=82=C2=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Ross Burton --- meta/recipes-core/base-files/base-files/profile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index e98e786b12..ba1b9ba156 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -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 - -- cgit v1.2.3