From 0dc41c6a484106fb53e706f9fa4fce764de71d22 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 31 Oct 2014 18:27:35 +0100 Subject: g-i-i: emulate router for edu main server --- bin/g-i-installation.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'bin/g-i-installation.sh') diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 6f990932..c56a65b6 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -281,12 +281,13 @@ boot_system() { echo "ERROR: no x86 boot sector found in $LV - its filetype is $FILE." exit 1 fi - QEMU_OPTS="$QEMU_OPTS -drive file=$LV,index=0,media=disk,cache=unsafe -m $RAMSIZE -net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254" + QEMU_OPTS="$QEMU_OPTS -drive file=$LV,index=0,media=disk,cache=unsafe -m $RAMSIZE" case $NAME in - debian-edu*-server) - QEMU_OPTS="$QEMU_OPTS -net nic,vlan=1 -net user,vlan=1" + debian-edu*main-server|debian-edu*combi-server) + QEMU_OPTS="$QEMU_OPTS -net nic,vlan=0 -net user,vlan=0,host=10.0.0.1,dhcpstart=10.0.2.2,dns=10.0.1.1 -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" ;; - *) ;; esac echo echo "Starting QEMU_ now:" -- cgit v1.2.3-54-g00ecf