meta-virtualization.lists.yoctoproject.org archive mirror
 help / color / mirror / Atom feed
From: Bertrand Marquis <bertrand.marquis@arm.com>
To: meta-virtualization@lists.yoctoproject.org
Cc: nd@arm.com, christopher.w.clark@gmail.com
Subject: [PATCH] xen/sysvinit: add hvc0 console only if not there already
Date: Tue, 28 Jun 2022 16:29:54 +0100	[thread overview]
Message-ID: <09a42f2562420f11d3187606418a73af07690f98.1656417819.git.bertrand.marquis@arm.com> (raw)

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 <bertrand.marquis@arm.com>
---
 recipes-core/sysvinit/sysvinit-inittab_xen.inc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/recipes-core/sysvinit/sysvinit-inittab_xen.inc b/recipes-core/sysvinit/sysvinit-inittab_xen.inc
index 7f92bd1..724f47d 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
 }
-- 
2.25.1



             reply	other threads:[~2022-06-28 15:30 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-28 15:29 Bertrand Marquis [this message]
2022-07-05 20:29 ` [meta-virtualization] [PATCH] xen/sysvinit: add hvc0 console only if not there already Bruce Ashfield
2022-07-06  5:25   ` Christopher Clark
2022-07-06  7:38   ` Bertrand Marquis
2022-07-07 14:56 ` Bruce Ashfield

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=09a42f2562420f11d3187606418a73af07690f98.1656417819.git.bertrand.marquis@arm.com \
    --to=bertrand.marquis@arm.com \
    --cc=christopher.w.clark@gmail.com \
    --cc=meta-virtualization@lists.yoctoproject.org \
    --cc=nd@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).