diff options
author | Ting Liu <ting.liu@freescale.com> | 2014-07-31 18:21:01 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-06 10:23:40 +0100 |
commit | 73c481d2cbc3e7c7ef9f594126aec581ec75b689 (patch) | |
tree | 04194e324c19bd75181d12ad8df0f22bb607bae4 | |
parent | a40db96621fdbc36889a53279aa8840513444a76 (diff) | |
download | poky-73c481d2cbc3e7c7ef9f594126aec581ec75b689.tar.gz |
base-files: set dynamic COLUMNS via resize command
By default, COLUMNS is set to 80. If possible, run 'resize' to
determine what the current dimensions are. This avoids the final
part of long lines overlap the start of the same line.
(From OE-Core rev: cc6360f4c4d97e0000f9d3545f381224ee99ce7d)
Signed-off-by: Ting Liu <ting.liu@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/base-files/base-files/profile | 4 | ||||
-rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index 0b2d9d79e5..88ab8d877b 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile | |||
@@ -26,6 +26,10 @@ if [ -d /etc/profile.d ]; then | |||
26 | unset i | 26 | unset i |
27 | fi | 27 | fi |
28 | 28 | ||
29 | if [ -x /usr/bin/resize ];then | ||
30 | /usr/bin/resize >/dev/null | ||
31 | fi | ||
32 | |||
29 | export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM | 33 | export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM |
30 | 34 | ||
31 | umask 022 | 35 | umask 022 |
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 30b1bf463b..07f5c54c97 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 | |||
@@ -102,6 +102,10 @@ do_install () { | |||
102 | install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf | 102 | install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf |
103 | install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd | 103 | install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd |
104 | 104 | ||
105 | if [ "/usr/bin" != "${bindir}" ]; then | ||
106 | sed -i "s,/usr/bin/resize,${bindir}/resize," ${D}${sysconfdir}/profile | ||
107 | fi | ||
108 | |||
105 | ln -sf /proc/mounts ${D}${sysconfdir}/mtab | 109 | ln -sf /proc/mounts ${D}${sysconfdir}/mtab |
106 | } | 110 | } |
107 | 111 | ||