summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-31 18:27:35 +0100
committerHolger Levsen <holger@layer-acht.org>2014-10-31 18:27:35 +0100
commit0dc41c6a484106fb53e706f9fa4fce764de71d22 (patch)
treefea725b233551dc88cfc6a4488a523fee1cf9675
parent33ff5daa3605ffa82ac8861e327422ff1f440b73 (diff)
downloadjenkins.debian.net-0dc41c6a484106fb53e706f9fa4fce764de71d22.tar.xz
g-i-i: emulate router for edu main server
-rw-r--r--bin/g-i-installation.sh9
1 files changed, 5 insertions, 4 deletions
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:"