summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing Liu <ting.liu@freescale.com>2014-07-31 18:21:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-06 10:23:28 +0100
commitcc6360f4c4d97e0000f9d3545f381224ee99ce7d (patch)
treebf4357a22101fe3988c3b4ec6c2153a816421042
parent06bdccb5c4df44745863a2290cbb83fd190f66df (diff)
downloadopenembedded-core-contrib-cc6360f4c4d97e0000f9d3545f381224ee99ce7d.tar.gz
openembedded-core-contrib-cc6360f4c4d97e0000f9d3545f381224ee99ce7d.tar.bz2
openembedded-core-contrib-cc6360f4c4d97e0000f9d3545f381224ee99ce7d.zip
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. 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/profile4
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb4
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
unset i
fi
+if [ -x /usr/bin/resize ];then
+ /usr/bin/resize >/dev/null
+fi
+
export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
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 () {
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
}