summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/base-files
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-04-03 14:48:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-08 22:48:04 +0100
commite77cdb761169e404556487ac650dc562000da406 (patch)
treec7fa2ca05a46a195f23a789111ef88bca4e5615a /meta/recipes-core/base-files
parent479a6202236832367bb48e4e089a6d99818685e5 (diff)
downloadopenembedded-core-contrib-e77cdb761169e404556487ac650dc562000da406.tar.gz
openembedded-core-contrib-e77cdb761169e404556487ac650dc562000da406.tar.bz2
openembedded-core-contrib-e77cdb761169e404556487ac650dc562000da406.zip
base-files: profile: Do not assume that the tty command exists
This avoids the following error when logging in to a host that does not have the tty command: -sh: tty: not found Reported-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/base-files')
-rw-r--r--meta/recipes-core/base-files/base-files/profile6
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb4
2 files changed, 3 insertions, 7 deletions
diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
index 22dfb4f219..ceaf15f799 100644
--- a/meta/recipes-core/base-files/base-files/profile
+++ b/meta/recipes-core/base-files/base-files/profile
@@ -22,12 +22,12 @@ if [ -d /etc/profile.d ]; then
unset i
fi
-if [ -x /usr/bin/resize ] && termpath="`tty`"; then
+if command -v resize >/dev/null && command -v tty >/dev/null; then
# Make sure we are on a serial console (i.e. the device used starts with
# /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which
# tries do use ssh
- case "$termpath" in
- /dev/tty[A-z]*) resize >/dev/null
+ case $(tty) in
+ /dev/tty[A-z]*) resize >/dev/null;;
esac
fi
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index f56969c52e..ca7bf06353 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -128,10 +128,6 @@ do_install () {
install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf
install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
- if [ "/usr/bin" != "${bindir}" ]; then
- sed -i "s,/usr/bin/resize,${bindir}/resize," ${D}${sysconfdir}/profile
- fi
-
ln -sf /proc/mounts ${D}${sysconfdir}/mtab
}