Package: debian-installer Version: 20121114 Severity: important Tags: d-i patch User: debian-bsd@lists.debian.org Usertags: kfreebsd X-Debbugs-Cc: debian-bsd@lists.debian.org
Hi, The netboot-9 images contain a kernel image named kfreebsd-9.gz but GRUB is still configured to PXE-boot a file called kfreebsd.gz The kfreebsd.gz file only exists in the 8.3 kernel netboot images. Attached is a patch to template grub.cfg with the appropriate kernel filename for the netboot image being built. Here is the result of it: $ grep 'kfreebsd $prefix/' netboot* -Rs | uniq netboot/dir_tree/debian-installer/kfreebsd-amd64/grub.cfg: kfreebsd $prefix/kfreebsd.gz netboot-9/dir_tree/debian-installer/kfreebsd-amd64/grub.cfg: kfreebsd $prefix/kfreebsd-9.gz netboot-gtk/dir_tree/debian-installer/kfreebsd-amd64/grub.cfg: kfreebsd $prefix/kfreebsd.gz netboot-gtk-9/dir_tree/debian-installer/kfreebsd-amd64/grub.cfg: kfreebsd $prefix/kfreebsd-9.gz Thanks! -- System Information: Debian Release: wheezy/sid APT prefers testing APT policy: (500, 'testing'), (1, 'experimental') Architecture: kfreebsd-amd64 (x86_64) Kernel: kFreeBSD 9.0-2-amd64 Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff --git a/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg b/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg index 95897e4..72a601e 100644 --- a/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg +++ b/build/boot/kfreebsd/grub-kfreebsd-pxe.cfg @@ -31,13 +31,13 @@ menuentry "" { menuentry "Default install" { echo "Loading ..." - kfreebsd $prefix/kfreebsd.gz + kfreebsd $prefix/@KERNEL@ kfreebsd_module $prefix/initrd.gz type=mfs_root } menuentry "Automated install" { echo "Loading ..." - kfreebsd $prefix/kfreebsd.gz + kfreebsd $prefix/@KERNEL@ kfreebsd_module $prefix/initrd.gz type=mfs_root set kFreeBSD.auto=true set kFreeBSD.priority=critical @@ -45,7 +45,7 @@ menuentry "Automated install" { menuentry "Expert install" { echo "Loading ..." - kfreebsd $prefix/kfreebsd.gz + kfreebsd $prefix/@KERNEL@ kfreebsd_module $prefix/initrd.gz type=mfs_root set kFreeBSD.priority=low } diff --git a/build/config/kfreebsd.cfg b/build/config/kfreebsd.cfg index c80740b..b8c2d05 100644 --- a/build/config/kfreebsd.cfg +++ b/build/config/kfreebsd.cfg @@ -120,8 +120,9 @@ arch_netboot_dir: cp $(TEMP_INITRD) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH) cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH) - sed -e "s/@ARCH@/$(ARCH)/g" $(GRUB_CFG_PXE) \ - > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub.cfg + sed -e "s/@ARCH@/$(ARCH)/g" \ + -e "s/@KERNEL@/$(notdir $(TEMP_KERNEL))/g" \ + $(GRUB_CFG_PXE) > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub.cfg if [ -n "$(GRUB_FONT)" ] ; then \ cp $(GRUB_FONT) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/font.pf2; \ fi