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

        * util/update-grub_lib.in (prepare_grub_to_access_device): If we were
        asked to setup access for the same partition that provides /boot,
        don't bother using UUIDs since our root already has the value we
        want.

diff --git a/ChangeLog b/ChangeLog
index 685d081dc9a68b17a7e68e056f2b71424963bfdd..653436fbed867bebaaea3a160266f116fdb24acc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-16  Robert Millan  <rmh@aybabtu.com>
+
+       * util/update-grub_lib.in (prepare_grub_to_access_device): If we were
+       asked to setup access for the same partition that provides /boot,
+       don't bother using UUIDs since our root already has the value we
+       want.
+
 2008-06-16  Robert Millan  <rmh@aybabtu.com>
 
        * util/biosdisk.c (convert_system_partition_to_system_disk): Detect

diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in
index 969ec30113728a3ada6ef26b9c5e3c4fc1454f4b..ac84b0bd324a0a1a4906e6fe126688cb3f81a9a9 100644 (file)
--- a/util/update-grub_lib.in
+++ b/util/update-grub_lib.in
@@ -114,6 +114,12 @@ prepare_grub_to_access_device ()
 {
   device=$1
 
+  # If our target is the same partition that provides /boot, our $root
+  # is already set to what we want, so no need to bother with UUIDs.
+  if [ "x${device}" = "x${GRUB_DEVICE_BOOT}" ] ; then
+    return
+  fi
+
   # If there's a filesystem UUID that GRUB is capable of identifiing, use it;
   # otherwise set root as per value in device.map.
   echo "set root=`${grub_probe} --device ${device} --target=drive`"