Hi,
I'd like to commit this debian-installer fix for kfreebsd, but also
make the same change for hurd, since I know the hurd netinst image for
PXE was broken in the same way.
Please could hurd porters let me know if this looks okay.
I haven't tested it by way of a debian-installer build on hurd, but it
should definitely be an improvement.
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: #759686)
+ - 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 <[email protected]> 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
[email protected]
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: https://lists.debian.org/[email protected]
