[elbe-devel] [PATCH] use another qemu MACHINE if running inside vmware

[Manuel Traut]

this is a workaround for the problem described here:
http://lists.linutronix.de/pipermail/elbe-devel/2017-July/000541.html

if 'pc' is used as MACHINE inside vmware. There is no login prompt for
'elbe initvm attach'

This fixes github issue #112

Signed-off-by: Manuel Traut <manut at linutronix.de>
---
 elbepack/init/Makefile.mako | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/elbepack/init/Makefile.mako b/elbepack/init/Makefile.mako
index 21f21cd0..bb9a3218 100644
--- a/elbepack/init/Makefile.mako
+++ b/elbepack/init/Makefile.mako
@@ -19,7 +19,16 @@
 MEMSIZE?=1024
 SMP?=`nproc`
 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)
+MACHINE?=pc-i440fx-2.6
+else
 MACHINE?=pc
+endif
+
 NICMODEL?=virtio
 CONSOLE?=ttyS0,115200n1
 LOOP_OFFSET?=1048576
-- 
2.14.0