[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: Fix vlan= option into name=

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
e02e6a01 by Samuel Thibault at 2019-10-30T22:46:31Z
Fix vlan= option into name=

Signed-off-by: Samuel Thibault <sthibault at debian.org>

- - - - -
cb7ee3f5 by Mattia Rizzolo at 2019-10-31T09:05:38Z
Merge branch 'master' of salsa.debian.org:sthibault/jenkins.debian.net

MR: https://salsa.debian.org/qa/jenkins.debian.net/merge_requests/48
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


1 changed file:

- bin/g-i-installation.sh


Changes:

=====================================
bin/g-i-installation.sh
=====================================
@@ -188,7 +188,7 @@ bootstrap_system() {
 	# qemu related variables (incl kernel+initrd) - display first, as we grep for this in the process list
 	QEMU_OPTS="-display vnc=$DISPLAY -enable-kvm -cpu host"
 	QEMU_WEBSERVER=http://10.0.2.1/
-	QEMU_NET_OPTS="-net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254"
+	QEMU_NET_OPTS="-net nic,name=hub0 -net user,name=hub0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254"
 	# preseeding related variables
 	PRESEEDCFG="preseed.cfg"
 	PRESEED_PATH=d-i-preseed-cfgs
@@ -255,7 +255,7 @@ bootstrap_system() {
 			EXTRA_APPEND="$EXTRA_APPEND rescue/enable=true"
 			;;
 		debian-edu_*ltsp-server|debian-edu_*combi-server)
-			QEMU_OPTS="$QEMU_OPTS -net nic,vlan=1 -net user,vlan=1"
+			QEMU_OPTS="$QEMU_OPTS -net nic,name=hub1 -net user,name=hub1"
 			EXTRA_APPEND="$EXTRA_APPEND netcfg/choose_interface=auto desktop=xfce"
 			;;
 		*)	;;
@@ -370,10 +370,10 @@ boot_system() {
 		exit 1
 	fi
 	QEMU_OPTS="$QEMU_OPTS -drive file=${FILEPATH},index=0,media=disk,cache=unsafe,format=raw -m $RAMSIZE"
-	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"
+	QEMU_OPTS="$QEMU_OPTS -net nic,name=hub0 -net user,name=hub0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254"
 	case $NAME in
 		debian-edu_*ltsp-server|debian-edu_*combi-server)
-				QEMU_OPTS="$QEMU_OPTS -net nic,vlan=1 -net user,vlan=1"
+				QEMU_OPTS="$QEMU_OPTS -net nic,name=hub1 -net user,name=hub1"
 				;;
 		*)
 				;;



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/e12e7bf9b10a3c3c1840413a41b9914f0bf50a32...cb7ee3f5d894cc3b303f47efc2cb0cd176be1178

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/e12e7bf9b10a3c3c1840413a41b9914f0bf50a32...cb7ee3f5d894cc3b303f47efc2cb0cd176be1178
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20191031/df267f21/attachment-0001.html>