[oe-commits] Paul Eggleton : sysvinit-inittab: ensure unique label for SERIAL_CONSOLES entries
git at git.openembedded.org
git at git.openembedded.org
Thu Oct 10 11:17:47 UTC 2013
Module: openembedded-core.git
Branch: dylan
Commit: d3393e28c5d6aa8a8bab754574ec68e540269a1c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d3393e28c5d6aa8a8bab754574ec68e540269a1c
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Wed Apr 24 15:33:18 2013 +0100
sysvinit-inittab: ensure unique label for SERIAL_CONSOLES entries
The label field in /etc/inittab entries needs to be unique, and the
numeric label being used for the SERIAL_CONSOLES getty entries was
clashing with the entries added for standard ttyX entries added via
SYSVINIT_ENABLED_GETTYS. Use the part after "tty" in the device name
(which is what the comment further down explicitly says should be done)
as the label rather than a simple incrementing number.
Fixes [YOCTO #4374].
(From OE-Core rev: 28d3202befcec72554885f8ea9cb7985523b89f5)
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../sysvinit/sysvinit-inittab_2.88dsf.bb | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index b289853..fbac893 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -21,14 +21,12 @@ do_install() {
echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab
fi
- idx=0
tmp="${SERIAL_CONSOLES}"
for i in $tmp
do
j=`echo ${i} | sed s/\;/\ /g`
- echo "${idx}:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
-
- idx=`expr $idx + 1`
+ label=`echo ${i} | sed -e 's/^.*;tty//'`
+ echo "$label:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
done
if [ "${USE_VT}" = "1" ]; then
More information about the Openembedded-commits
mailing list