[elbe-devel] [PATCH] improve kvm machine-emulation heuristic

[Manuel Traut]

From: Lukasz Walewski <lwalewski at s-can.at>

a1f422fb6ec80b3245e74d3e07f220de48974da7 introduces the heuristic.

But pc-i440fx-2.6 is not available on stretch:
>> qemu-system-x86_64: -M pc-i440fx-2.6: Unsupported machine type

So apply the heuristic only if running on a stretch system.

Signed-off-by: Lukasz Walewski <lwalewski at s-can.at>
Signed-off-by: Manuel Traut <manut at linutronix.de>
Tested-by: Lukasz Walewski <lwalewski at s-can.at> (stretch/elbe 2.2)
---
 elbepack/init/Makefile.mako | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/elbepack/init/Makefile.mako b/elbepack/init/Makefile.mako
index bb9a3218..4ccafd57 100644
--- a/elbepack/init/Makefile.mako
+++ b/elbepack/init/Makefile.mako
@@ -23,7 +23,8 @@ INTERPRETER?=${prj.text('interpreter', default=defs, key='interpreter')}
 # this is a workaround for
 # http://lists.linutronix.de/pipermail/elbe-devel/2017-July/000541.html
 VIRT=$(shell test -x /usr/bin/systemd-detect-virt && /usr/bin/systemd-detect-virt)
-ifeq ($(VIRT), vmware)
+DIST=$(shell lsb_release -cs)
+ifeq ($(filter-out vmware stretch, $(VIRT) $(DIST)),)
 MACHINE?=pc-i440fx-2.6
 else
 MACHINE?=pc
-- 
2.15.1