Bug#711799: debian-installer: non-grub PXE boot images crash

[Steven Chamberlain]

tags 711799 + patch
thanks

Hi KiBi,

Please may I commit this patch directly to debian-installer Git?

Hopefully it is self-explanatory from the changelog.

Earlier I thought it was modules terminal+gettext that were missing
to cause the hang/crash, but it turned out to be only tftp.  (I'd been
testing dozens of permutations of different GRUB version [Debian-
packaged and vanilla upstream], different builds [official Debian and my
own], different selection of GRUB modules, and different versions of
grub-image;  so I made a few mistakes along the way that led me to wrong
conclusions initially.)

The xorriso incompatiblity refers to this scary warning seen with an
outdated xorriso package but newer grub-common:
> grub-mkrescue: warning: Your xorriso doesn't support `--grub2-boot-info'. Some features are disabled. Please use xorriso 1.2.9 or later..
> grub-mkrescue: warning: Your xorriso doesn't support `--grub2-boot-info'. Your core image is too big. Boot as disk is disabled. Please use xorriso 1.2.9 or later..

I don't know if it caused actual breakage, but since 1.3.2-1 is already
in sid/jessie I felt it safer to raise Build-Depends to that version.

Thanks.

--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,18 @@ debian-installer (2014XXXX) UNRELEASED; urgency=low
     adding a syslinux-utils build-dep (Closes: #751731), no thanks to its
     maintainer as far as cooperation is concerned (See: #751724, #759189).
 
+  [ Steven Chamberlain ]
+  * On kfreebsd and hurd, which use GRUB for PXE booting, request two
+    additional modules in the grub-mkimage step: (Closes: #711799)
+    - tftp: required since GRUB 2.02 otherwise PXE boot will crash/hang
+    - gfxterm_background: required since GRUB 2.02 for the boot splash
+      image functionality to be available
+    - raise the grub-pc (and indirectly grub-common) build dependency to
+      >= 2.02~beta2~ on these architectures, because module
+      gfxterm_background did not exist in GRUB 2.00
+    - raise the xorriso build dependency to >= 1.3.2-1~ on these
+      architectures, for compatibility with grub-mkrescue in GRUB 2.02
+
  -- Cyril Brulebois <kibi at debian.org>  Sat, 02 Aug 2014 02:59:35 +0200
 
 debian-installer (20140802) unstable; urgency=low
--- a/debian/control
+++ b/debian/control
@@ -157,9 +157,9 @@ Build-Depends:
 #              Alternative boot method for win32 platforms.
        makefs [kfreebsd-any],
 #              Used to create an UFS1 filesystem from a directory tree.
-       grub-pc (>= 1.99-1~) [kfreebsd-i386 kfreebsd-amd64 hurd-i386],
+       grub-pc (>= 2.02~beta2~) [kfreebsd-i386 kfreebsd-amd64 hurd-i386],
 #              Used as the CD-ROM's bootloader
-       xorriso [kfreebsd-i386 kfreebsd-amd64 hurd-i386],
+       xorriso (>= 1.3.2-1~) [kfreebsd-i386 kfreebsd-amd64 hurd-i386],
 #               Used by grub-pc to create the CD-ROM images
        debian-ports-archive-keyring [sh4 sparc64],
 #              Used for architectures hosted on debian-ports.org
--- a/build/config/hurd.cfg
+++ b/build/config/hurd.cfg
@@ -33,7 +33,7 @@ GRUB_CFG_PXE=boot/hurd/grub-hurd-pxe.cfg
 # GRUB modules
 GRUB_PLATFORM=i386-pc
 GRUB_MODDIR=/usr/lib/grub/$(GRUB_PLATFORM)
-GRUB_MODULES_PXE=pxe multiboot cpuid echo gfxterm gzio minicmd normal png vbe
+GRUB_MODULES_PXE=pxe tftp multiboot cpuid echo gfxterm gfxterm_background gzio minicmd normal png vbe
 
 # Location for Xen example configuration.
 XENCFG = $(SOME_DEST)/$(EXTRANAME)debian.cfg
--- a/build/config/kfreebsd.cfg
+++ b/build/config/kfreebsd.cfg
@@ -15,7 +15,7 @@ GRUB_CFG_PXE=boot/kfreebsd/grub-kfreebsd-pxe.cfg
 # GRUB modules
 GRUB_PLATFORM=i386-pc
 GRUB_MODDIR=/usr/lib/grub/$(GRUB_PLATFORM)
-GRUB_MODULES_PXE=pxe bsd cpuid echo gfxterm gzio minicmd normal png vbe
+GRUB_MODULES_PXE=pxe tftp bsd cpuid echo gfxterm gfxterm_background gzio minicmd normal png vbe
 
 # Location for Xen example configuration.
 XENCFG = $(SOME_DEST)/$(EXTRANAME)debian.cfg

-- 
Steven Chamberlain
steven at pyro.eu.org