diff options
| author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2013-07-30 02:00:01 +0300 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-08-01 21:57:52 -0700 |
| commit | d5620c0b6782b88f3e6de97b1ddadcf21207fc57 (patch) | |
| tree | 1afbeb14c4ff43fcb150234945db7128804a0ee1 /meta/lib | |
| parent | 054dba3b7b96349e1e20e3a58acd98bb68ab2536 (diff) | |
| download | openembedded-core-d5620c0b6782b88f3e6de97b1ddadcf21207fc57.tar.gz openembedded-core-d5620c0b6782b88f3e6de97b1ddadcf21207fc57.tar.bz2 openembedded-core-d5620c0b6782b88f3e6de97b1ddadcf21207fc57.zip | |
oeqa/utils/qemurunner: tweak console bootparam and ip command
Sync serial baud rate with default inittab which should
help with apparent boot fails. Also keep a console on tty1.
Also we shouldn't assume eth0 it the right interface.
(systemd images can rename interfaces to something else).
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 02e0a4a11d..45b3ccb789 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -25,7 +25,7 @@ class QemuRunner: self.rootfs = rootfs self.streampath = '/tmp/qemuconnection.%s' % os.getpid() - self.qemuparams = 'bootparams="console=ttyS0" qemuparams="-serial unix:%s,server,nowait"' % self.streampath + self.qemuparams = 'bootparams="console=tty1 console=ttyS0,115200n8" qemuparams="-serial unix:%s,server,nowait"' % self.streampath self.qemupid = None self.ip = None @@ -76,7 +76,7 @@ class QemuRunner: if not match: bb.note("Couldn't get prompt, all I got was:\n%s" % match.group(0)) return False - console.write("ip addr show eth0 | sed -n '3p' | awk '{ print $2 }' | cut -f 1 -d \"/\"\n") + console.write("ip addr show `ip route list | sed -n '1p' | awk '{print $5}'` | sed -n '3p' | awk '{ print $2 }' | cut -f 1 -d \"/\"\n") (index, match, text) = console.expect([r"((?:[0-9]{1,3}\.){3}[0-9]{1,3})"],10) console.close() if match: |