From e67637e4472ff3a1e2801b84ee3d69d4e14b9efc Mon Sep 17 00:00:00 2001 From: Richard Tollerton Date: Tue, 11 Oct 2016 20:08:15 -0500 Subject: base-files: fix profile error under < /dev/null Previous attempts to constrain execution of `resize` to only TTYs did not properly handle situations when `tty` would return the string "not a tty". The symptom is "/etc/profile: line 34: test: too many arguments". Fix this by utilizing the exit code of `tty`. Also use `case` instead of `cut` to eliminate a subshell. Signed-off-by: Richard Tollerton Signed-off-by: Ross Burton --- meta/recipes-core/base-files/base-files/profile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index 0a05e455ff..7367fd1e29 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -22,10 +22,12 @@ if [ -d /etc/profile.d ]; then unset i fi -if [ -x /usr/bin/resize ];then +if [ -x /usr/bin/resize ] && termpath="`tty`"; then # 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 + case "$termpath" in + /dev/tty*) resize >/dev/null + esac fi export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM -- cgit 1.2.3-korg