Bug#739422: debian-cd: Make kfreebsd & hurd images usbkey-bootable

[Samuel Thibault <sthibault@debian.org>]

Package: debian-cd
Version: 3.1.14
Severity: normal
Tags: patch

Hello,

The kfreebsd & hurd ISO images can't be booted from USB keys yet.  I
have added to debian-installer the required steps to create a grub_embed
file which can be passed to xorriso's --embedded-boot option, debian-cd
now just has to pick it up to get usbkey-bootable images, could you
apply the attached patch which does this?

Thanks,
Samuel

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13.0 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-- 
Samuel
N: beep beep Miam miam? 
y: ++
a: kill -MIAM -1

Index: tools/boot/jessie/boot-hurd
===================================================================
--- tools/boot/jessie/boot-hurd	(révision 2572)
+++ tools/boot/jessie/boot-hurd	(copie de travail)
@@ -27,6 +27,21 @@
        DI_DIST="$DI_CODENAME"
 fi
 
+case "$MKISOFS" in
+    *xorriso*)
+        XORRISO_VER=$($MKISOFS --version 2>&1 | awk '
+            NR==1 {
+                 split($3, ver, ".")
+                 print ver[1]*10000+ver[2]*100+ver[3]
+            }')
+        # OK
+        ;;
+    *)
+	echo "ERROR: debian-cd now depends on xorriso for making x86 bootable CDs."
+	exit 1;
+	;;
+esac
+
 cd $CDDIR/..
 
 # Only disc 1 bootable
@@ -67,6 +82,7 @@
 tar -C boot$N -zxf cdrom/debian-cd_info.tar.gz
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/grub/grub_eltorito"
+[ -f boot$N/boot/grub/grub_embed ] && add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--embedded-boot boot$N/boot/grub/grub_embed"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.cat"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
 
Index: tools/boot/jessie/boot-kfreebsd
===================================================================
--- tools/boot/jessie/boot-kfreebsd	(révision 2572)
+++ tools/boot/jessie/boot-kfreebsd	(copie de travail)
@@ -31,6 +31,21 @@
        DI_DIST="$DI_CODENAME"
 fi
 
+case "$MKISOFS" in
+    *xorriso*)
+        XORRISO_VER=$($MKISOFS --version 2>&1 | awk '
+            NR==1 {
+                 split($3, ver, ".")
+                 print ver[1]*10000+ver[2]*100+ver[3]
+            }')
+        # OK
+        ;;
+    *)
+	echo "ERROR: debian-cd now depends on xorriso for making x86 bootable CDs."
+	exit 1;
+	;;
+esac
+
 cd $CDDIR/..
 
 # Only disc 1 bootable
@@ -79,6 +94,7 @@
 tar -C boot$N -zxf cdrom/debian-cd_info.tar.gz
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/grub/grub_eltorito"
+[ -f boot$N/boot/grub/grub_embed ] && add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--embedded-boot boot$N/boot/grub/grub_embed"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.cat"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"