Commit e588be00 authored by Holger Levsen's avatar Holger Levsen

g-i: use 10.0.2.1 for the host always

parent 6a0a739e
......@@ -130,8 +130,8 @@ bootstrap_system() {
else
QEMU_KERNEL="--kernel $KERNEL --initrd $INITRD"
fi
QEMU_OPTS="$QEMU_OPTS -drive file=$NAME.raw,index=0,media=disk,cache=writeback -m $RAMSIZE"
QEMU_WEBSERVER=http://10.0.2.2/
QEMU_OPTS="$QEMU_OPTS -drive file=$NAME.raw,index=0,media=disk,cache=writeback -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_WEBSERVER=http://10.0.2.1/
# preseeding related variables
PRESEED_PATH=d-i-preseed-cfgs
PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_preseed.cfg"
......@@ -162,8 +162,7 @@ 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,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/
QEMU_OPTS="$QEMU_OPTS -net nic,vlan=1 -net user,vlan=1"
EXTRA_APPEND="$EXTRA_APPEND interface=eth0"
;;
*) ;;
......@@ -191,7 +190,7 @@ boot_system() {
echo "Booting system installed with g-i installation test for $NAME."
# qemu related variables (incl kernel+initrd) - display first, as we grep for this in the process list
QEMU_OPTS="-display vnc=$DISPLAY -no-shutdown"
QEMU_OPTS="$QEMU_OPTS -drive file=$NAME.raw,index=0,media=disk,cache=writeback -m $RAMSIZE"
QEMU_OPTS="$QEMU_OPTS -drive file=$NAME.raw,index=0,media=disk,cache=writeback -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"
echo "Checking $NAME.raw:"
FILE=$(file $NAME.raw)
if [ $(echo $FILE | grep "x86 boot sector" | wc -l) -eq 0 ] ; then
......@@ -200,7 +199,7 @@ boot_system() {
fi
case $NAME in
debian-edu*_combi-server)
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_OPTS="$QEMU_OPTS -net nic,vlan=1 -net user,vlan=1"
;;
*) ;;
esac
......@@ -490,7 +489,6 @@ monitor_system() {
sleep 4
echo "Taking screenshots every 2 seconds now, until qemu ends for whatever reasons or 6h have passed or if the test seems to hang."
echo
set -x
let MAX_RUNS=NR+10800
while [ $NR -lt $MAX_RUNS ] ; do
#
......
......@@ -88,7 +88,7 @@ d-i anna/choose_modules multiselect debian-edu-install-udeb: Execute Deb
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
......@@ -88,7 +88,7 @@ d-i anna/choose_modules multiselect debian-edu-install-udeb: Execute Deb
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
......@@ -88,7 +88,7 @@ d-i anna/choose_modules multiselect debian-edu-install-udeb: Execute Deb
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
......@@ -88,7 +88,7 @@ d-i anna/choose_modules multiselect debian-edu-install-udeb: Execute Deb
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
......@@ -88,7 +88,7 @@ d-i anna/choose_modules multiselect debian-edu-install-udeb: Execute Deb
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
......@@ -88,7 +88,7 @@ d-i anna/choose_modules multiselect debian-edu-install-udeb: Execute Deb
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
......@@ -88,7 +88,7 @@ d-i anna/choose_modules multiselect debian-edu-install-udeb: Execute Deb
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
......@@ -84,7 +84,7 @@ d-i netcfg/wireless_wep string
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
debian_sid_daily_lxde_preseed.cfg
\ No newline at end of file
debian_sid_daily_lxde_preseed.cfg
\ No newline at end of file
This diff is collapsed.
......@@ -84,7 +84,7 @@ d-i netcfg/wireless_wep string
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
......@@ -84,7 +84,7 @@ d-i netcfg/wireless_wep string
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
......@@ -84,7 +84,7 @@ d-i netcfg/wireless_wep string
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
......@@ -84,7 +84,7 @@ d-i netcfg/wireless_wep string
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
debian_sid_daily_lxde_preseed.cfg
\ No newline at end of file
This diff is collapsed.
......@@ -84,7 +84,7 @@ d-i netcfg/wireless_wep string
d-i mirror/country string manual
d-i mirror/http/hostname string ftp.de.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://10.0.2.2:3128/
d-i mirror/http/proxy string http://10.0.2.1:3128/
# Suite to install.
#d-i mirror/suite string testing
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment