From aa0ac74a03da311d3bd4819502c556a184835a84 Mon Sep 17 00:00:00 2001 From: Bertrand Marquis Date: Tue, 28 Jun 2022 16:29:54 +0100 Subject: xen/sysvinit: add hvc0 console only if not there already The base inittab recipe is creating inittab entries for consoles listed in SERIAL_CONSOLES. For qemu, this contains "115200,hvc0" so an entry is created in inittab for it. Prevent to create a second entry if hvc0 is present in SERIAL_CONSOLES. On qemuarm, this solves issues with the console when starting on top of Xen as dom0. Signed-off-by: Bertrand Marquis Signed-off-by: Bruce Ashfield --- recipes-core/sysvinit/sysvinit-inittab_xen.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'recipes-core') diff --git a/recipes-core/sysvinit/sysvinit-inittab_xen.inc b/recipes-core/sysvinit/sysvinit-inittab_xen.inc index 7f92bd1f..724f47dc 100644 --- a/recipes-core/sysvinit/sysvinit-inittab_xen.inc +++ b/recipes-core/sysvinit/sysvinit-inittab_xen.inc @@ -1,4 +1,10 @@ + + do_install:append() { - echo "" >> ${D}${sysconfdir}/inittab - echo "X0:12345:respawn:${base_sbindir}/getty-wrapper 115200 hvc0" >> ${D}${sysconfdir}/inittab + # if SERIAL_CONSOLES contains hvc0, it is already added in inittab so do + # not add it twice + if echo "${SERIAL_CONSOLES}" | grep -vq "hvc0"; then + echo "" >> ${D}${sysconfdir}/inittab + echo "X0:12345:respawn:${base_sbindir}/getty-wrapper 115200 hvc0" >> ${D}${sysconfdir}/inittab + fi } -- cgit v1.2.3-54-g00ecf