diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/qemuboot.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 95cd1d6c4a..cc1cbce69d 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass | |||
@@ -93,7 +93,7 @@ QB_RNG ?= "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-p | |||
93 | QB_OPT_APPEND ?= "" | 93 | QB_OPT_APPEND ?= "" |
94 | QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@" | 94 | QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@" |
95 | QB_CMDLINE_IP_SLIRP ?= "ip=dhcp" | 95 | QB_CMDLINE_IP_SLIRP ?= "ip=dhcp" |
96 | QB_CMDLINE_IP_TAP ?= "ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0" | 96 | QB_CMDLINE_IP_TAP ?= "ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0::eth0:off:8.8.8.8" |
97 | QB_ROOTFS_EXTRA_OPT ?= "" | 97 | QB_ROOTFS_EXTRA_OPT ?= "" |
98 | QB_GRAPHICS ?= "" | 98 | QB_GRAPHICS ?= "" |
99 | 99 | ||
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() |