2010-09-10 Robert Millan <rmh@gnu.org>

	* util/grub.d/10_kfreebsd.in: Fix ${kfreebsd_device} initialization
	on ZFS.  Now non-main filesystems are supported as / too.

diff --git a/ChangeLog b/ChangeLog
index a51619eef4d2df2af8840dc46e19d83e6a0c8d55..fb6b19befff51f390c77de32ef70fa7f69df7d24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-10  Robert Millan  <rmh@gnu.org>
+
+       * util/grub.d/10_kfreebsd.in: Fix ${kfreebsd_device} initialization
+       on ZFS.  Now non-main filesystems are supported as / too.
+
 2010-09-09  Colin Watson  <cjwatson@ubuntu.com>
 
        * Makefile.util.def (libgrub.a): Move grub-core/kern/emu/hostfs.c

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 40ac240c74f66a8c5ced51b142277d132c952139..e39423999d4b75fb473c4656035b9bbaf597e18a 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -138,7 +138,12 @@ while [ "x$list" != "x" ] ; do
   esac
 
   case ${GRUB_FS} in
-    zfs)               kfreebsd_device=$(grub-probe -t fs_label --device ${GRUB_DEVICE}) ;;
+    zfs)
+                       # zpool name
+                       kfreebsd_device=$(grub-probe -t fs_label --device ${GRUB_DEVICE})
+                       # filesystem name (empty string for the main filesystem)
+                       kfreebsd_device="${kfreebsd_device}$(grub-mkrelpath / | sed -e "s,/*@$,,")"
+    ;;
     *)                 kfreebsd_device=${GRUB_DEVICE} ;;
   esac