From 3cca7ef3b6583eecb0463eeeae79a335863e88dd Mon Sep 17 00:00:00 2001 From: robertmh Date: Mon, 16 Jun 2008 22:08:03 +0000 Subject: [PATCH] 2008-06-16 Robert Millan * 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. --- ChangeLog | 7 +++++++ util/update-grub_lib.in | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 685d081dc..653436fbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-16 Robert Millan + + * 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 * 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 969ec3011..ac84b0bd3 100644 --- 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`"