From a44eaf53ab14aedae3cd1bc6cc2e62dbbde562ee Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 19 Aug 2010 18:20:37 +0100 Subject: [PATCH] Add support for ext2 root on GNU/kFreeBSD (thanks, Aurelien Jarno; closes: #593467). --- debian/changelog | 2 ++ debian/patches/kfreebsd_ext2.patch | 33 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 36 insertions(+) create mode 100644 debian/patches/kfreebsd_ext2.patch diff --git a/debian/changelog b/debian/changelog index 37ccf113f..3d59b7aad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ grub2 (1.98+20100804-3) UNRELEASED; urgency=low * Escape single quotes when removing them from $mode in zz-update-grub, so that this works when /bin/sh is bash (thanks, Will Dyson; closes: #593242). + * Add support for ext2 root on GNU/kFreeBSD (thanks, Aurelien Jarno; + closes: #593467). -- Robert Millan Mon, 16 Aug 2010 15:17:13 +0200 diff --git a/debian/patches/kfreebsd_ext2.patch b/debian/patches/kfreebsd_ext2.patch new file mode 100644 index 000000000..8d66bfffd --- /dev/null +++ b/debian/patches/kfreebsd_ext2.patch @@ -0,0 +1,33 @@ +Description: Add support for ext2 root on GNU/kFreeBSD +Author: Aurelien Jarno +Bug-Debian: http://bugs.debian.org/593467 +Forwarded: http://lists.gnu.org/archive/html/grub-devel/2010-08/msg00038.html +Last-Update: 2010-08-19 + +Index: b/util/grub.d/10_kfreebsd.in +=================================================================== +--- a/util/grub.d/10_kfreebsd.in ++++ b/util/grub.d/10_kfreebsd.in +@@ -75,6 +75,14 @@ + fi + + case "${kfreebsd_fs}" in ++ ext2fs) ++ test -e "${module_dir}/ext2fs.ko" ++ ++ printf '%s\n' "${prepare_module_dir_cache}" ++ cat << EOF ++ kfreebsd_module_elf ${module_dir_rel}/ext2fs.ko ++EOF ++ ;; + zfs) + test -e "${module_dir}/opensolaris.ko" + test -e "${module_dir}/zfs.ko" +@@ -121,6 +129,7 @@ + + case ${GRUB_FS} in + ufs1 | ufs2) kfreebsd_fs=ufs ;; ++ ext2) kfreebsd_fs=ext2fs ;; + *) kfreebsd_fs=${GRUB_FS} ;; + esac + diff --git a/debian/patches/series b/debian/patches/series index 79d9472a1..9f008d2b6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,3 +14,4 @@ zfs_fix_chroot.patch zfs_fix_segfault.patch zfs_fix_pathname.patch zfs_fix_label_arg.patch +kfreebsd_ext2.patch -- 2.39.5