From: robertmh Date: Thu, 19 Jun 2008 12:31:42 +0000 (+0000) Subject: 2008-06-19 Robert Millan X-Git-Tag: 1.98~1468 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73940cec5873d1e62e45c2000cf1cdc59a0d5a66;p=thirdparty%2Fgrub.git 2008-06-19 Robert Millan * util/update-grub_lib.in (prepare_grub_to_access_device): Remove check for partition that provides /boot/grub. Its logic is flawed, as it prevents prepare_grub_to_access_device() from being called multiple times. --- diff --git a/ChangeLog b/ChangeLog index f28519489..e3ab853dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-19 Robert Millan + + * util/update-grub_lib.in (prepare_grub_to_access_device): Remove + check for partition that provides /boot/grub. Its logic is flawed, + as it prevents prepare_grub_to_access_device() from being called + multiple times. + 2008-06-19 Robert Millan * util/update-grub_lib.in (prepare_grub_to_access_device): Issue diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in index b7d141e4e..ed4029a61 100644 --- a/util/update-grub_lib.in +++ b/util/update-grub_lib.in @@ -114,12 +114,6 @@ prepare_grub_to_access_device () { device=$1 - # 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_probe} --target=device /boot/grub`" ] ; then - return - fi - # Abstraction modules aren't auto-loaded. abstraction="`${grub_probe} --device ${device} --target=abstraction`" if [ "x${abstraction}" = "x" ] ; then : ; else