diff options
| author |   juraj.linkes <juraj.linkes@pantheon.tech> | 2019-07-17 10:02:01 +0200 |
|---|---|---|
| committer | juraj.linkes <juraj.linkes@pantheon.tech> | 2019-07-17 10:02:01 +0200 |
| commit | 3c1a390130a96b223b4bfe4c55ca789f33d17b13 (patch) | |
| tree | 949d1f1783fc99a38ceb4c77b18ec1e5da9ef850 | |
| parent | 0e44c4871318dedc7eeb3fb180ece9eec7cc3ff6 (diff) | |
Add backward compatibility for kernel vm image
https://gerrit.fd.io/r/#/c/20577/ replaced kvm kernel with custom build
of generic kernel, which would be picked up with '/opt/boot/vmlinuz*'
wildcard and which wouldn't work with this code. Fix this by adding
'-kvm' to the wildcard so that the kvm image is used with this code.
Change-Id: I9e9d978ad7c980d74f88f761b884eca599dee454
Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>
| -rw-r--r-- | resources/libraries/python/QemuUtils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py index 55da28a289..707b069cdc 100644 --- a/resources/libraries/python/QemuUtils.py +++ b/resources/libraries/python/QemuUtils.py @@ -208,7 +208,7 @@ class QemuUtils(object): self._params.add('fsdev', 'local,id=root9p,path=/,security_model=none') self._params.add('device', 'virtio-9p-pci,fsdev=root9p,mount_tag=/dev/root') - self._params.add('kernel', '$(readlink -m {img}* | tail -1)'. + self._params.add('kernel', '$(readlink -m {img}*-kvm | tail -1)'. format(img=self._opt.get('img'))) self._params.add('append', '"ro rootfstype=9p rootflags=trans=virtio ' |