summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Díaz <daniel.diaz@linaro.org>2017-03-23 15:34:44 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-01 08:14:58 +0100
commit63c605b8413a8cd1f29926d3e604b14a9c275ca2 (patch)
tree4b3f3063423ccd01ff849508a73f8e55e847e78c
parent03246177821a3bbe5303dc1cc5c31f72fe909d82 (diff)
downloadpoky-63c605b8413a8cd1f29926d3e604b14a9c275ca2.tar.gz
base-files: resize only serial tty's in profile
We don't want to run resize on non serial consoles. There's been an earlier attempt (6557787), so this builds upon that. The problem we're seeing is that if there is text buffered in the virtual console (like from a desperate user trying to enter login details), resize will get stuck while calling ioctl(tty, TCSETAW); Since serial consoles are named (not just numbered), this change limits resize's reach even further to run only on /dev/tty[A-z] (thus avoiding /dev/tty[0-9]). (From OE-Core rev: 474ef7c95722aa68ee5dfbae2920d7c3d436d717) Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/base-files/base-files/profile2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
index 7367fd1e29..c616616cee 100644
--- a/meta/recipes-core/base-files/base-files/profile
+++ b/meta/recipes-core/base-files/base-files/profile
@@ -26,7 +26,7 @@ if [ -x /usr/bin/resize ] && termpath="`tty`"; then
26 # Make sure we are on a serial console (i.e. the device used starts with /dev/tty), 26 # Make sure we are on a serial console (i.e. the device used starts with /dev/tty),
27 # otherwise we confuse e.g. the eclipse launcher which tries do use ssh 27 # otherwise we confuse e.g. the eclipse launcher which tries do use ssh
28 case "$termpath" in 28 case "$termpath" in
29 /dev/tty*) resize >/dev/null 29 /dev/tty[A-z]*) resize >/dev/null
30 esac 30 esac
31fi 31fi
32 32