diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-01-09 23:27:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-11 10:53:44 +0000 |
commit | 2a3e849326592d8213cf29fcb6f49d10136f32d6 (patch) | |
tree | 6e0ff751386050cc32ff3564a085c6f0da4c5778 /meta/lib/oeqa/utils/qemurunner.py | |
parent | 6ba5808ebf41faa5377b52a2183f53149cc90f4b (diff) | |
download | poky-2a3e849326592d8213cf29fcb6f49d10136f32d6.tar.gz |
qemuboot/runqemu: fully form the ip= kernel parameter
New systemd is actually parsing this in systemd-network-generator
and fails if it is not fully formed. 'off' means 'static ip, do nothing':
https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt
(From OE-Core rev: 2cf12c8dde0f05917797f8b4a80883dc0647b95d)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/qemurunner.py')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 0397148082..76296d50cd 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -407,7 +407,7 @@ class QemuRunner: | |||
407 | self.logger.debug("qemu cmdline used:\n{}".format(cmdline)) | 407 | self.logger.debug("qemu cmdline used:\n{}".format(cmdline)) |
408 | except (IndexError, ValueError): | 408 | except (IndexError, ValueError): |
409 | # Try to get network configuration from runqemu output | 409 | # Try to get network configuration from runqemu output |
410 | match = re.match(r'.*Network configuration: (?:ip=)*([0-9.]+)::([0-9.]+):([0-9.]+)$.*', | 410 | match = re.match(r'.*Network configuration: (?:ip=)*([0-9.]+)::([0-9.]+):([0-9.]+).*', |
411 | out, re.MULTILINE|re.DOTALL) | 411 | out, re.MULTILINE|re.DOTALL) |
412 | if match: | 412 | if match: |
413 | self.ip, self.server_ip, self.netmask = match.groups() | 413 | self.ip, self.server_ip, self.netmask = match.groups() |