[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1786/8267] base-files: restrict resize to run on serial consoles only in profile │·

[Emmanuele Bassi <ebassi src gnome org>]

commit 5aca5bc9a13d9d4a477cfd2d04edbcc8a8a0e412
Author: bavery <brian avery intel com>
Date:   Mon Aug 8 17:20:32 2016 -0700

    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>

 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 e98e786..ba1b9ba 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
-