* util/grub.d/10_kfreebsd.in: Correct the patch to zpool.cache as it's

	always in /boot/zfs.
	Reported by: Yuta Satoh.

diff --git a/ChangeLog b/ChangeLog
index 936af2f8614d24f29b1a687a5d0635d187796d0b..a28a1f7dff3257a18d392378268f6e7b1196b9d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub.d/10_kfreebsd.in: Correct the patch to zpool.cache as it's
+       always in /boot/zfs.
+       Reported by: Yuta Satoh.
+
 2013-01-03  Yuta Satoh  <nigoro>
 
        * util/grub.d/10_kfreebsd.in: Fix improper references to grub-probe by

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 2a48b52ac0aa4c5ef4ea4b6c08995e4dfc5778cb..c123ceb2e04e94c39aa8e3351ab8762f16384734 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -122,10 +122,10 @@ EOF
     zfs)
       load_kfreebsd_module opensolaris false
 
-      ls "${dirname}/zfs/zpool.cache" > /dev/null
+      ls "/boot/zfs/zpool.cache" > /dev/null
       printf '%s\n' "${prepare_boot_cache}"
       sed "s/^/$submenu_indentation/" << EOF
-       kfreebsd_module         ${rel_dirname}/zfs/zpool.cache type=/boot/zfs/zpool.cache
+       kfreebsd_module         $(make_system_path_relative_to_its_root /boot)/zfs/zpool.cache type=/boot/zfs/zpool.cache
 EOF
     ;;
   esac