From: Jörg Sommer Date: Thu, 29 Aug 2024 18:33:45 +0000 (+0200) Subject: runqemu: Fix detection of -serial parameter X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6d035894120b45b42f146ab5b3110522c58d178;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git runqemu: Fix detection of -serial parameter The pattern `-serial` matches also `-device usb-serial` and `virtio-serial` which are not the desired parameter. This causes the serial console ttyS1 is missing and Systemd's getty@ttyS1 fails constantly. Signed-off-by: Jörg Sommer Signed-off-by: Richard Purdie --- diff --git a/scripts/runqemu b/scripts/runqemu index 69cd44864e5..f350021258a 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1483,7 +1483,7 @@ to your build configuration. # If no serial or serialtcp options were specified, only ttyS0 is created # and sysvinit shows an error trying to enable ttyS1: # INIT: Id "S1" respawning too fast: disabled for 5 minutes - serial_num = len(re.findall("-serial", self.qemu_opt)) + serial_num = len(re.findall("(^| )-serial ", self.qemu_opt)) # Assume if the user passed serial options, they know what they want # and pad to two devices @@ -1503,7 +1503,7 @@ to your build configuration. self.qemu_opt += " %s" % self.get("QB_SERIAL_OPT") - serial_num = len(re.findall("-serial", self.qemu_opt)) + serial_num = len(re.findall("(^| )-serial ", self.qemu_opt)) if serial_num < 2: self.qemu_opt += " -serial null"