Re: removing kfreebsd-9 from D-I (Re: Bug#743292: dhclient fails during installation with weekly iso (freebsd-amd64))

[Robert Millan <rmh@debian.org>]

On 04/05/14 12:54, Cyril Brulebois wrote:
> > If noone can provide a better solution, I'd like to remove kfreebsd-9
> > from the D-I builds.
>
> Feel free to do so. Just try to make sure the boot menus are properly
> updated. ;)

It'd need a small fix. Can you check it in? I don't have write perms in debian-cd.

Thank you

--
Robert Millan

Index: tools/boot/jessie/boot-kfreebsd
===================================================================
--- tools/boot/jessie/boot-kfreebsd	(revision 2572)
+++ tools/boot/jessie/boot-kfreebsd	(working copy)
@@ -40,7 +40,7 @@
 fi
 
 # Download boot images.
-BOOT_IMAGES="cdrom/debian-cd_info.tar.gz cdrom/kfreebsd.gz cdrom/kfreebsd-9.gz cdrom/initrd.gz"
+BOOT_IMAGES="cdrom/debian-cd_info.tar.gz cdrom/kfreebsd.gz cdrom/kfreebsd-10.gz cdrom/initrd.gz"
 
 if [ "$ARCH" = kfreebsd-amd64 ]; then
 	BOOT_IMAGES="$BOOT_IMAGES cdrom/gtk/initrd.gz"
@@ -64,8 +64,8 @@
 # Install kernel and initrd
 mkdir -p $CDDIR/boot/kernel/
 cp "cdrom/kfreebsd.gz" "$CDDIR/boot/kernel/kfreebsd.gz"
-if [ -f cdrom/kfreebsd-9.gz ] ; then
-   cp "cdrom/kfreebsd-9.gz" "$CDDIR/boot/kernel/kfreebsd-9.gz"
+if [ -f cdrom/kfreebsd-10.gz ] ; then
+   cp "cdrom/kfreebsd-10.gz" "$CDDIR/boot/kernel/kfreebsd-10.gz"
 fi
 cp "cdrom/initrd.gz" "$CDDIR/boot/mfsroot.gz"
 
Index: tools/generate_di+k_list
===================================================================
--- tools/generate_di+k_list	(revision 2572)
+++ tools/generate_di+k_list	(working copy)
@@ -230,18 +230,13 @@
 #endif
 
 #ifdef ARCH_kfreebsd_amd64
-kfreebsd-image-8-amd64
-kfreebsd-image-9-amd64
+kfreebsd-image-10-amd64
 grub-pc
 #endif
 
 #ifdef ARCH_kfreebsd_i386
-kfreebsd-image-8-486
-kfreebsd-image-8-686
-kfreebsd-image-8-686-smp
-kfreebsd-image-9-486
-kfreebsd-image-9-686
-kfreebsd-image-9-686-smp
+kfreebsd-image-10-486
+kfreebsd-image-10-686
 grub-pc
 libc0.1-i686
 #endif