backwards compatibility in grub.cfg

[Robert Millan <rmh@aybabtu.com>]

[-- Attachment #1: Type: text/plain, Size: 666 bytes --]


Hi,

I'm adding this to the Debian package.  We need this for backwards
compatibility in case the new update-grub is used in combination with an
older install of GRUB in /boot/grub (which will surely happen a lot).

I'm wondering if it makes sense to commit this in official GRUB too.  For
people installing by hand it's not a problem, and distributors can sort it
out themselves, I guess, but it may also be helpful.  What do you think?

(we have similar checks like "if font " in 00_header, but this is much
uglier)

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What good is a phone call… if you are unable to speak?
(as seen on /.)

[-- Attachment #2: compat.diff --]
[-- Type: text/x-diff, Size: 780 bytes --]

diff -x configure -x config.h.in -x CVS -x '*~' -x '*.mk' -urp ../grub2/util/update-grub_lib.in ./util/update-grub_lib.in
--- ../grub2/util/update-grub_lib.in	2008-05-30 22:55:35.000000000 +0200
+++ ./util/update-grub_lib.in	2008-05-30 23:16:53.000000000 +0200
@@ -116,10 +116,9 @@ 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.
+  echo "set root=`${grub_probe} --device ${device} --target=drive`"
   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`"
   fi
 
   # Abstraction modules aren't auto-loaded.