a5bd9f6
From 98701532f45165422f45b8cdf405a7f0abf03fba Mon Sep 17 00:00:00 2001
a5bd9f6
From: Yuta Satoh  <nigoro>
a5bd9f6
Date: Thu, 3 Jan 2013 23:06:07 +0100
a5bd9f6
Subject: [PATCH 082/364] 	* util/grub.d/10_kfreebsd.in: Fix improper
a5bd9f6
 references to grub-probe by 	${grub_probe}
a5bd9f6
a5bd9f6
---
a5bd9f6
 ChangeLog                  | 5 +++++
a5bd9f6
 util/grub.d/10_kfreebsd.in | 6 +++---
a5bd9f6
 2 files changed, 8 insertions(+), 3 deletions(-)
a5bd9f6
a5bd9f6
diff --git a/ChangeLog b/ChangeLog
a5bd9f6
index 087b5c3..936af2f 100644
a5bd9f6
--- a/ChangeLog
a5bd9f6
+++ b/ChangeLog
a5bd9f6
@@ -1,3 +1,8 @@
a5bd9f6
+2013-01-03  Yuta Satoh  <nigoro>
a5bd9f6
+
a5bd9f6
+	* util/grub.d/10_kfreebsd.in: Fix improper references to grub-probe by
a5bd9f6
+	${grub_probe}
a5bd9f6
+
a5bd9f6
 2013-01-03  Vladimir Serbinenko  <phcoder@gmail.com>
a5bd9f6
 
a5bd9f6
 	* configure.ac: Extend -Wno-trampolines to host.
a5bd9f6
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
a5bd9f6
index 260dda8..2a48b52 100644
a5bd9f6
--- a/util/grub.d/10_kfreebsd.in
a5bd9f6
+++ b/util/grub.d/10_kfreebsd.in
a5bd9f6
@@ -54,7 +54,7 @@ load_kfreebsd_module ()
a5bd9f6
   fi
a5bd9f6
 
a5bd9f6
   if [ -z "${prepare_module_dir_cache}" ]; then
a5bd9f6
-    prepare_module_dir_cache="$(prepare_grub_to_access_device $(grub-probe -t device "${module_dir}") | grub_add_tab)"
a5bd9f6
+    prepare_module_dir_cache="$(prepare_grub_to_access_device $(${grub_probe} -t device "${module_dir}") | grub_add_tab)"
a5bd9f6
   fi
a5bd9f6
 
a5bd9f6
   printf '%s\n' "${prepare_module_dir_cache}"
a5bd9f6
@@ -112,7 +112,7 @@ EOF
a5bd9f6
 
a5bd9f6
   load_kfreebsd_module acpi true
a5bd9f6
 
a5bd9f6
-  for abstraction in dummy $(grub-probe -t abstraction --device ${GRUB_DEVICE}) ; do
a5bd9f6
+  for abstraction in dummy $(${grub_probe} -t abstraction --device ${GRUB_DEVICE}) ; do
a5bd9f6
     case $abstraction in
a5bd9f6
       lvm) load_kfreebsd_module geom_linux_lvm false ;;
a5bd9f6
     esac
a5bd9f6
@@ -179,7 +179,7 @@ while [ "x$list" != "x" ] ; do
a5bd9f6
   case ${GRUB_FS} in
a5bd9f6
     zfs)
a5bd9f6
 			# zpool name
a5bd9f6
-			kfreebsd_device=$(grub-probe -t fs_label --device ${GRUB_DEVICE})
a5bd9f6
+			kfreebsd_device=$(${grub_probe} -t fs_label --device ${GRUB_DEVICE})
a5bd9f6
 			# filesystem name (empty string for the main filesystem)
a5bd9f6
 			kfreebsd_device="${kfreebsd_device}$(${grub_mkrelpath} / | sed -e "s,/*@$,,")"
a5bd9f6
     ;;
a5bd9f6
-- 
a5bd9f6
1.8.1.4
a5bd9f6