summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2013-01-08 22:59:39 +0100
committerHolger Levsen <holger@layer-acht.org>2013-01-08 22:59:39 +0100
commit30cf45eea5849cb0e92c7a9a283e65b0790c387a (patch)
tree66d416629b99cb3415652e7d746b5a8dcd70994d /bin
parent9148659d9706001e20d70f54beb2cc548f0faad6 (diff)
downloadjenkins.debian.net-30cf45eea5849cb0e92c7a9a283e65b0790c387a.tar.xz
try harder to get qemu networking right
Diffstat (limited to 'bin')
-rwxr-xr-xbin/g-i-installation.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index a0156af3..fba7f7e2 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -162,7 +162,7 @@ bootstrap_system() {
EXTRA_APPEND="$EXTRA_APPEND rescue/enable=true"
;;
debian-edu*_combi-server)
- QEMU_OPTS="$QEMU_OPTS -net nic -net user -net nic,model=e1000"
+ QEMU_OPTS="$QEMU_OPTS -net nic,vlan=0 -net user,vlan=0 -net nic,vlan=1 -net user,vlan=1"
EXTRA_APPEND="$EXTRA_APPEND interface=eth0"
;;
*) ;;
@@ -199,7 +199,7 @@ boot_system() {
fi
case $NAME in
debian-edu*_combi-server)
- QEMU_OPTS="$QEMU_OPTS -net nic -net user -net nic,model=e1000"
+ QEMU_OPTS="$QEMU_OPTS -net nic,vlan=0 -net user,vlan=0 -net nic,vlan=1 -net user,vlan=1"
;;
*) ;;
esac