diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2018-08-01 13:25:35 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-14 11:36:22 +0100 |
| commit | 41688279cba3a5afc4fdc65fd245b9bb6ada695e (patch) | |
| tree | 08d8aca3176c80dd6d75eb7379e6b971488c5a1a | |
| parent | 4af10fe67a31368163bb5d468ee2c5a85ce0fff3 (diff) | |
| download | openembedded-core-41688279cba3a5afc4fdc65fd245b9bb6ada695e.tar.gz openembedded-core-41688279cba3a5afc4fdc65fd245b9bb6ada695e.tar.bz2 openembedded-core-41688279cba3a5afc4fdc65fd245b9bb6ada695e.zip | |
base-files: fix handling of resize
The current handling of resize is incorrect. Using `resize > /dev/null
2>&1 && resize > /dev/null' will cause the second resize command to not
execute because 'resize > /dev/null 2>&1' will fail for resize utility
from busybox.
What we really should do is just to check whether ${bindir}/resize
is executable and execute it if so. Using '-x' is sufficient.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/base-files/base-files/profile | 6 | ||||
| -rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index e14cb2d878..9e4283e0c7 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -24,11 +24,7 @@ fi # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which tries do # use ssh case $(tty 2>/dev/null) in - # The first invocation of resize verifies that it exists, the second - # does the actual resizing. This is due to that resize uses stderr to - # determine the size of the tty, which does not work if it is redirected - # to /dev/null. - /dev/tty[A-z]*) resize >/dev/null 2>&1 && resize >/dev/null;; + /dev/tty[A-z]*) [ -x @BINDIR@/resize ] && @BINDIR@/resize >/dev/null;; esac export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM 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 1c0863b1c7..05c0562661 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 @@ -121,6 +121,7 @@ do_install () { install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile + sed -i 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/profile install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc |