From 69ba137ec8154ad77045f3607687c5809f007825 Mon Sep 17 00:00:00 2001
From: robertmh <robertmh@localhost>
Date: Sat, 31 May 2008 09:47:06 +0000
Subject: [PATCH] 2008-05-31  Robert Millan  <rmh@aybabtu.com>

        * util/update-grub_lib.in: Replace `grub-probe' with `${grub_probe}'.
        * util/update-grub.in: Likewise.
---
 ChangeLog               |  5 +++++
 util/update-grub.in     | 10 +++++-----
 util/update-grub_lib.in |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 376b5dd50..007439e32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-31  Robert Millan  <rmh@aybabtu.com>
+
+	* util/update-grub_lib.in: Replace `grub-probe' with `${grub_probe}'.
+	* util/update-grub.in: Likewise.
+
 2008-05-30  Pavel Roskin  <proski@gnu.org>
 
 	* util/biosdisk.c (linux_find_partition): Simplify logic and
diff --git a/util/update-grub.in b/util/update-grub.in
index 9296e7336..84a5e1852 100644
--- a/util/update-grub.in
+++ b/util/update-grub.in
@@ -100,16 +100,16 @@ if test -e ${grub_prefix}/device.map ; then : ; else
 fi
 
 # Device containing our userland.  Typically used for root= parameter.
-GRUB_DEVICE="`grub-probe --target=device /`"
-GRUB_DEVICE_UUID="`grub-probe --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
+GRUB_DEVICE="`${grub_probe} --target=device /`"
+GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
 
 # Device containing our /boot partition.  Usually the same as GRUB_DEVICE.
-GRUB_DEVICE_BOOT="`grub-probe --target=device /boot`"
-GRUB_DEVICE_BOOT_UUID="`grub-probe --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
+GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
+GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
 
 # Filesystem for the device containing our userland.  Used for stuff like
 # choosing Hurd filesystem module.
-GRUB_FS="`grub-probe --target=fs / 2> /dev/null || echo unknown`"
+GRUB_FS="`${grub_probe} --target=fs / 2> /dev/null || echo unknown`"
 
 if test -f ${sysconfdir}/default/grub ; then
   . ${sysconfdir}/default/grub
diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in
index 1dadbfcfc..75c5bbf5d 100644
--- a/util/update-grub_lib.in
+++ b/util/update-grub_lib.in
@@ -116,7 +116,7 @@ prepare_grub_to_access_device ()
 
   # If there's a filesystem UUID that GRUB is capable of identifiing, use it;
   # otherwise set root as per value in device.map.
-  if fs_uuid="`grub-probe --device ${device} --target=fs_uuid 2> /dev/null`" ; then
+  if fs_uuid="`${grub_probe} --device ${device} --target=fs_uuid 2> /dev/null`" ; then
     echo "search --fs-uuid --set ${fs_uuid}"
   else
     echo "set root=`${grub_probe} --device ${device} --target=drive`"