diff options
author | bavery <brian.avery@intel.com> | 2016-08-08 17:20:32 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-10 10:46:34 +0100 |
commit | 5aca5bc9a13d9d4a477cfd2d04edbcc8a8a0e412 (patch) | |
tree | 221b50b2f9dff1f861b6b3331971810ec4073801 /meta/recipes-core | |
parent | b6ecbee4b2951a5ca6ceafbc20a300c8d375ddf7 (diff) | |
download | poky-5aca5bc9a13d9d4a477cfd2d04edbcc8a8a0e412.tar.gz |
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
(From OE-Core rev: 655778769f50d3aff74d7a436d28ac31b6aebb11)
Signed-off-by: bavery <brian.avery@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/base-files/base-files/profile | 7 |
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 | |||
6 | test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. | 6 | test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. |
7 | 7 | ||
8 | if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then | 8 | if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then |
9 | TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html | 9 | TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html |
10 | # for an explanation of how to set this to your local timezone. | 10 | # for an explanation of how to set this to your local timezone. |
11 | export TZ | 11 | export TZ |
12 | fi | 12 | fi |
@@ -29,10 +29,11 @@ if [ -d /etc/profile.d ]; then | |||
29 | fi | 29 | fi |
30 | 30 | ||
31 | if [ -x /usr/bin/resize ];then | 31 | if [ -x /usr/bin/resize ];then |
32 | /usr/bin/resize >/dev/null | 32 | # Make sure we are on a serial console (i.e. the device used starts with /dev/tty), |
33 | # otherwise we confuse e.g. the eclipse launcher which tries do use ssh | ||
34 | test `tty | cut -c1-8` = "/dev/tty" && resize >/dev/null | ||
33 | fi | 35 | fi |
34 | 36 | ||
35 | export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM | 37 | export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM |
36 | 38 | ||
37 | umask 022 | 39 | umask 022 |
38 | |||