summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/base-files
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2016-10-11 20:08:15 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-15 09:49:18 +0100
commite67637e4472ff3a1e2801b84ee3d69d4e14b9efc (patch)
tree670f046b8245f4a23d4b2ea76ef722f77ba93032 /meta/recipes-core/base-files
parent7f8c36d8aa00da109e842c790c6a0ab7a849de72 (diff)
downloadopenembedded-core-contrib-e67637e4472ff3a1e2801b84ee3d69d4e14b9efc.tar.gz
openembedded-core-contrib-e67637e4472ff3a1e2801b84ee3d69d4e14b9efc.tar.bz2
openembedded-core-contrib-e67637e4472ff3a1e2801b84ee3d69d4e14b9efc.zip
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 <rich.tollerton@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/base-files')
-rw-r--r--meta/recipes-core/base-files/base-files/profile6
1 files 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