[elbe-devel] [PATCH v2] Enable initvm creation with newer qemu versions

[bage at linutronix.de]

From: Bastian Germann <bage at linutronix.de>

QEMU >= 2.9 does not have the vlan option for the ancient -net flag.
Use a current nic configuration. Leave out explicit hubport config.

This enables `elbe initvm create` on Debian buster which has QEMU 3.1.

Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 elbepack/init/Makefile.mako | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/elbepack/init/Makefile.mako b/elbepack/init/Makefile.mako
index 0b4960e8..8e8b84d2 100644
--- a/elbepack/init/Makefile.mako
+++ b/elbepack/init/Makefile.mako
@@ -104,8 +104,7 @@ all: .stamps/stamp-install-initial-image
 		-append 'root=/dev/$(HD_NAME) debconf_priority=critical console=$(CONSOLE) DEBIAN_FRONTEND=text' \
 		-no-reboot \
 		-nographic \
-		-net nic,vlan=1,model=$(NICMODEL),macaddr="${nicmac}" \
-		-net user,vlan=1 \
+		-nic user,model=$(NICMODEL),mac="${nicmac}" \
 		-m $(MEMSIZE) \
 		-smp $(SMP) \
 		-usb \
-- 
2.20.1