Package: debian-installer Severity: normal Tags: patch Next upstream release of GRUB (1.97~beta5) will have its kFreeBSD loader renamed (from "freebsd" to "kfreebsd") to reflect that it is loading the kernel of FreeBSD rather than FreeBSD itself. Since GRUB 1.96 didn't include a kFreeBSD loader at all, there's no backward compatibility in this change.
Attached patch modifies build/boot/kfreebsd/grub-kfreebsd-*.cfg to use the new interface. Please let us know when it is appropiate for us to upload the new version. We can coordinate through IRC or whichever way you prefer. -- System Information: Debian Release: 5.0.3 APT prefers stable APT policy: (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.26-libre2-2-amd64 (SMP w/2 CPU cores) Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash
Index: build/boot/kfreebsd/grub-kfreebsd-i386.cfg =================================================================== --- build/boot/kfreebsd/grub-kfreebsd-i386.cfg (revision 60995) +++ build/boot/kfreebsd/grub-kfreebsd-i386.cfg (working copy) @@ -17,12 +17,12 @@ menuentry "Install Debian GNU/kFreeBSD 32 bits" { echo "Loading ..." set root=$cd - freebsd /boot/kernel/kfreebsd.gz - freebsd_module_elf /boot/kernel/acpi.ko - freebsd_module /boot/mfsroot.gz type=mfs_root - set FreeBSD.vfs.root.mountfrom=ufs:/dev/md0 - set FreeBSD.hw.ata.ata_dma=0 # needed for qemu hard disk # TODO: delete - set FreeBSD.hw.ata.atapi_dma=0 # needed for qemu cd # TODO: 1 + kfreebsd /boot/kernel/kfreebsd.gz + kfreebsd_module_elf /boot/kernel/acpi.ko + kfreebsd_module /boot/mfsroot.gz type=mfs_root + set kFreeBSD.vfs.root.mountfrom=ufs:/dev/md0 + set kFreeBSD.hw.ata.ata_dma=0 # needed for qemu hard disk # TODO: delete + set kFreeBSD.hw.ata.atapi_dma=0 # needed for qemu cd # TODO: 1 } menuentry "Boot from first hard disk" { Index: build/boot/kfreebsd/grub-kfreebsd-amd64.cfg =================================================================== --- build/boot/kfreebsd/grub-kfreebsd-amd64.cfg (revision 60995) +++ build/boot/kfreebsd/grub-kfreebsd-amd64.cfg (working copy) @@ -17,11 +17,11 @@ menuentry "Install Debian GNU/kFreeBSD 64 bits" { echo "Loading ..." set root=$cd - freebsd /boot/kernel/kfreebsd.gz - freebsd_module /boot/mfsroot.gz type=mfs_root - set FreeBSD.vfs.root.mountfrom=ufs:/dev/md0 - set FreeBSD.hw.ata.ata_dma=0 # needed for qemu hard disk # TODO: delete - set FreeBSD.hw.ata.atapi_dma=0 # needed for qemu cd # TODO: 1 + kfreebsd /boot/kernel/kfreebsd.gz + kfreebsd_module /boot/mfsroot.gz type=mfs_root + set kFreeBSD.vfs.root.mountfrom=ufs:/dev/md0 + set kFreeBSD.hw.ata.ata_dma=0 # needed for qemu hard disk # TODO: delete + set kFreeBSD.hw.ata.atapi_dma=0 # needed for qemu cd # TODO: 1 } menuentry "Boot from first hard disk" {