From: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Date: Mon, 7 Oct 2013 15:05:04 +0000 (+0000)
Subject: sysvinit-inittab: Fix getting tty device name from SERIAL_CONSOLES entries
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e01f9574a62d8707397857d8f95ff40a307d12f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

sysvinit-inittab: Fix getting tty device name from SERIAL_CONSOLES entries

Currently the part after "tty" in the device name go into label along with
everything after that part. For example if SERIAL_CONSOLES="115200;vt100;ttyS0"
than label=S0 but if SERIAL_CONSOLES="115200;ttyS0;vt100" than label=S0;vt100.
If SERIAL_CONSOLES="..;ttyX;..", part after 'X' should also be trimmed.

(From OE-Core rev: b00b9ae5693e04cacd0843c12a529e7f3dc501ed)

Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index 23c284d131c..05ba4104413 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -22,7 +22,7 @@ do_install() {
     for i in $tmp
     do
 	j=`echo ${i} | sed s/\;/\ /g`
-	label=`echo ${i} | sed -e 's/^.*;tty//'`
+	label=`echo ${i} | sed -e 's/^.*;tty//' -e 's/;.*//'`
 	echo "$label:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
     done