summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbavery <brian.avery@intel.com>2016-08-08 17:20:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:45:33 +0100
commit655778769f50d3aff74d7a436d28ac31b6aebb11 (patch)
tree33b22d0a352f12ad8c4cb9c35b3872a407957eb2
parent0092a076adb11cac411c86389af84bb96169730f (diff)
downloadopenembedded-core-contrib-655778769f50d3aff74d7a436d28ac31b6aebb11.tar.gz
openembedded-core-contrib-655778769f50d3aff74d7a436d28ac31b6aebb11.tar.bz2
openembedded-core-contrib-655778769f50d3aff74d7a436d28ac31b6aebb11.zip
base-files: restrict resize to run on serial consoles only in profile │·
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>
-rw-r--r--meta/recipes-core/base-files/base-files/profile7
1 files changed, 4 insertions, 3 deletions
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
-