Merge branch 'master' of git://git.debian.org/git/qa/jenkins.debian.net

3 files changed, 17 insertions, 22 deletions

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 1f5c46da..7234800e 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -318,7 +318,12 @@ bootstrap_system() {
 			*)		;;
 		esac
 	fi
-	echo "--append \"$APPEND\"" >> $QEMU_LAUNCHER
+	case $NAME in
+		*_kfreebsd)	# not supported for the --append option
+				;;
+		*)		echo "--append \"$APPEND\"" >> $QEMU_LAUNCHER
+				;;
+	esac
 	set -x
 	(bash -x $QEMU_LAUNCHER && touch $RESULTS/qemu_quit ) &
 	set +x
diff --git a/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg
index 76cf8894..c321dc2a 100644
--- a/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg
@@ -149,23 +149,13 @@ d-i clock-setup/ntp boolean true
 # - regular: use the usual partition types for your architecture
 # - lvm:     use LVM to partition the disk
 # - crypto:  use LVM within an encrypted partition
-d-i partman-auto/method string lvm
-
-# If one of the disks that are going to be automatically partitioned
-# contains an old LVM configuration, the user will normally receive a
-# warning. This can be preseeded away...
-d-i partman-lvm/device_remove_lvm boolean true
-# The same applies to pre-existing software RAID array:
-d-i partman-md/device_remove_md boolean true
-# And the same goes for the confirmation to write the lvm partitions.
-d-i partman-lvm/confirm boolean true
-d-i partman-lvm/confirm_nooverwrite boolean true
+d-i partman-auto/method string regular
 
 # You can choose one of the three predefined partitioning recipes:
 # - atomic: all files in one partition
 # - home:   separate /home partition
 # - multi:  separate /home, /usr, /var, and /tmp partitions
-d-i partman-auto/choose_recipe select atomic
+d-i partman-auto/choose_recipe select multi
 
 # Or provide a recipe of your own...
 # If you have a way to get a recipe file into the d-i environment, you can
@@ -305,7 +295,7 @@ tasksel tasksel/first multiselect standard, desktop
 # If the desktop task is selected, install the kde and xfce desktops
 # instead of the default gnome desktop.
 #tasksel tasksel/desktop multiselect kde, xfce
-tasksel tasksel/desktop multiselect lxde
+tasksel tasksel/desktop multiselect xfce
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
@@ -320,7 +310,7 @@ tasksel tasksel/desktop multiselect lxde
 #popularity-contest popularity-contest/participate boolean false
 
 # install grub on the first disk found
-d-i grub-installer/bootdev  string /dev/sda
+d-i grub-installer/bootdev  string /dev/ada
 
 ### Finishing up the installation
 # During installations from serial console, the regular virtual consoles
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 9fc0aa2b..34815974 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -346,8 +346,8 @@
          my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_wheezy_kfreebsd':
          my_title: 'Debian (wheezy) kfreebsd desktop install'
-         my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://ftp.de.debian.org/debian/dists/wheezy/main/installer-kfreebsd-amd64/current/images/netboot/mini.iso'
-         my_description: 'Do a fully automated installation of Debian kfreebsd desktop - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_wheezy_kfreebsd_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://ftp.de.debian.org/debian/dists/wheezy/main/installer-kfreebsd-amd64/current/images/netboot-9/gtk/netboot.tar.gz'
+         my_description: 'Do a fully automated installation of Debian kfreebsd-amd64 desktop - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_wheezy_kfreebsd_preseed.cfg">this preseed.cfg</a>) using PXE netboot gtk.'
          my_timed: '42 16 21 * *'
          my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_wheezy_lxde':
@@ -376,8 +376,8 @@
          my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_jessie_kfreebsd':
          my_title: 'Debian (jessie) kfreebsd desktop install'
-         my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/netboot-9/mini.iso'
-         my_description: 'Do a fully automated installation of Debian kfreebsd desktop - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_jessie_kfreebsd_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/netboot-10/gtk/netboot.tar.gz'
+         my_description: 'Do a fully automated installation of Debian kfreebsd-amd64 desktop - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_jessie_kfreebsd_preseed.cfg">this preseed.cfg</a>) using PXE netboot gtk.'
          my_timed: '42 16 */7 * *'
          #my_timed: '42 16 2,9,16,23 * *'
          my_recipients: 'holger@layer-acht.org'
@@ -400,9 +400,9 @@
          my_timed: '42 8 * * *'
          my_recipients: 'holger@layer-acht.org'
       - '{name}_debian_sid_daily_kfreebsd':
-         my_title: 'Debian (sid daily build CD) kfreebsd desktop install'
-         my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://cdimage.debian.org/cdimage/daily-builds/sid_d-i/arch-latest/kfreebsd-amd64/iso-cd/debian-testing-kfreebsd-amd64-netinst.iso'
-         my_description: 'Do a fully automated installation of Debian kfreebsd desktop - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
+         my_title: 'Debian (sid daily build PXE) kfreebsd desktop install'
+         my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/netboot-10/gtk/netboot.tar.gz'
+         my_description: 'Do a fully automated installation of Debian kfreebsd-amd64 desktop - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg">this preseed.cfg</a>) using PXE netboot gtk.'
          my_timed: '42 8 */7 * *'
          #my_timed: '42 8 * * *'
          my_recipients: 'holger@layer-acht.org'