diff options
| author | Holger Levsen <holger@layer-acht.org> | 2013-01-09 01:41:45 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2013-01-09 01:41:45 +0100 |
| commit | 933263cbc5ac4ce505b772931b1a536430fd3131 (patch) | |
| tree | 41817fd1fbca7ea2b6417845e18485023a66fc44 | |
| parent | 3facc4b56a8913ff2bd1a71fe8cf0bd8d6e86e5d (diff) | |
| download | jenkins.debian.net-933263cbc5ac4ce505b772931b1a536430fd3131.tar.xz | |
fixup: g-i: try harder to make d-edu combi-server work
| -rwxr-xr-x | bin/g-i-installation.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 85da544d..205877cb 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,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254 -net user,vlan=0 -net nic,vlan=1 -net user,vlan=1" + QEMU_OPTS="$QEMU_OPTS -net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254 -net nic,vlan=1 -net user,vlan=1" QEMU_WEBSERVER=http://10.0.2.1/ EXTRA_APPEND="$EXTRA_APPEND interface=eth0" ;; @@ -200,7 +200,7 @@ boot_system() { fi case $NAME in debian-edu*_combi-server) - QEMU_OPTS="$QEMU_OPTS -net nic,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254 -net user,vlan=0 -net nic,vlan=1 -net user,vlan=1" + QEMU_OPTS="$QEMU_OPTS -net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254 -net nic,vlan=1 -net user,vlan=1" ;; *) ;; esac |