summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2013-01-09 01:36:53 +0100
committerHolger Levsen <holger@layer-acht.org>2013-01-09 01:36:53 +0100
commit3facc4b56a8913ff2bd1a71fe8cf0bd8d6e86e5d (patch)
treecbf1265169ede3c667ec51f46156d5c71f3b978f /bin
parent30cf45eea5849cb0e92c7a9a283e65b0790c387a (diff)
downloadjenkins.debian.net-3facc4b56a8913ff2bd1a71fe8cf0bd8d6e86e5d.tar.xz
g-i: try harder to make d-edu combi-server work
Diffstat (limited to 'bin')
-rwxr-xr-xbin/g-i-installation.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index fba7f7e2..85da544d 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -162,7 +162,8 @@ bootstrap_system() {
EXTRA_APPEND="$EXTRA_APPEND rescue/enable=true"
;;
debian-edu*_combi-server)
- QEMU_OPTS="$QEMU_OPTS -net nic,vlan=0 -net user,vlan=0 -net nic,vlan=1 -net user,vlan=1"
+ 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_WEBSERVER=http://10.0.2.1/
EXTRA_APPEND="$EXTRA_APPEND interface=eth0"
;;
*) ;;
@@ -199,7 +200,7 @@ boot_system() {
fi
case $NAME in
debian-edu*_combi-server)
- QEMU_OPTS="$QEMU_OPTS -net nic,vlan=0 -net user,vlan=0 -net nic,vlan=1 -net user,vlan=1"
+ 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"
;;
*) ;;
esac