2008-06-17 Robert Millan <rmh@aybabtu.com>

        * util/update-grub_lib.in (prepare_grub_to_access_device): Use
        /boot/grub for the check in last commit, not /boot (they could be
        different partitions).

diff --git a/ChangeLog b/ChangeLog
index 653436fbed867bebaaea3a160266f116fdb24acc..efef229bdbc082b171d1d926dc3174fcd84a007b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-17  Robert Millan  <rmh@aybabtu.com>
+
+       * util/update-grub_lib.in (prepare_grub_to_access_device): Use
+       /boot/grub for the check in last commit, not /boot (they could be
+       different partitions).
+
 2008-06-16  Robert Millan  <rmh@aybabtu.com>
 
        * util/update-grub_lib.in (prepare_grub_to_access_device): If we were

diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in
index ac84b0bd324a0a1a4906e6fe126688cb3f81a9a9..76b7460a13597a56e1eb42f2d6b3eab62592dd5e 100644 (file)
--- a/util/update-grub_lib.in
+++ b/util/update-grub_lib.in
@@ -114,9 +114,9 @@ prepare_grub_to_access_device ()
 {
   device=$1
 
-  # If our target is the same partition that provides /boot, our $root
+  # If our target is the same partition that provides /boot/grub, our $root
   # is already set to what we want, so no need to bother with UUIDs.
-  if [ "x${device}" = "x${GRUB_DEVICE_BOOT}" ] ; then
+  if [ "x${device}" = "x`${grub_probe} --target=device /boot/grub`" ] ; then
     return
   fi