From 91d9f3271c12fb755ab332637b17650d5fe75ce2 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Wed, 3 Aug 2016 19:36:36 -0700 Subject: sysvinit-inittab_2.88dsf.bb: Allow aliasing with SERIAL_CONSOLES_CHECK With some hardware the name of the device node and the name in /proc/console differ. This causes SERIAL_CONSOLES_CHECK to not enable working consoles in these cases. This patch changes SERIAL_CONSOLES_CHECK to have an optional alias for the checked consoles. The new format is: : Fixes [YOCTO #9440]. Signed-off-by: California Sullivan Signed-off-by: Ross Burton --- meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/sysvinit') diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index bdc3416aa9..f136ad821b 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -58,9 +58,12 @@ if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then tmp="${SERIAL_CONSOLES_CHECK}" for i in $tmp do - j=`echo ${i} | sed s/^.*\;//g` + j=`echo ${i} | sed -e s/^.*\;//g -e s/\:.*//g` + k=`echo ${i} | sed s/^.*\://g` if [ -z "`grep ${j} /proc/consoles`" ]; then - sed -i /^.*${j}$/d /etc/inittab + if [ -z "${k}" ] || [ -z "`grep ${k} /proc/consoles`" ] || [ ! -e /dev/${j} ]; then + sed -i /^.*${j}$/d /etc/inittab + fi fi done kill -HUP 1 -- cgit 1.2.3-korg