From 3facc4b56a8913ff2bd1a71fe8cf0bd8d6e86e5d Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 9 Jan 2013 01:36:53 +0100 Subject: g-i: try harder to make d-edu combi-server work --- bin/g-i-installation.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bin') 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 -- cgit v1.2.3-70-g09d2