[PATCH] Small fix in grub-setup

[PATCH] Small fix in grub-setup

[Javier Martín]

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

Here goes a small fix to a grub-setup error that has driven /me crazy
for the last 4 hours: in the recent split between core_path and
core_path_dev, one occurrence of the former that should have been turned
into the latter was not, thus making grub-setup spit lots of nonsensical
(to me) "error: file not found" messages. I spent a big deal of time
trying to debug the wrong piece of code, since I stubbornly thought that
the error was in the "read-and-check" loop, while it really was later in
the file... Sigh

The fix is so simple that I post it directly here. If a ChangeLog entry
is necessary, I'd propose "complete core_path variable split" or
something along that lines.


Index: util/i386/pc/grub-setup.c
===================================================================
RCS file: /sources/grub/grub2/util/i386/pc/grub-setup.c,v
retrieving revision 1.39
diff -u -r1.39 grub-setup.c
--- util/i386/pc/grub-setup.c   26 Jun 2008 15:29:32 -0000      1.39
+++ util/i386/pc/grub-setup.c   30 Jun 2008 01:53:00 -0000
@@ -452,7 +452,7 @@
     }

   /* Now read the core image to determine where the sectors are.  */
-  file = grub_file_open (core_path);
+  file = grub_file_open (core_path_dev);
   if (! file)
     grub_util_error ("%s", grub_errmsg);



[-- Attachment #2: Esta parte del mensaje está firmada digitalmente --]
[-- Type: application/pgp-signature, Size: 827 bytes --]

Re: [PATCH] Small fix in grub-setup

[Pavel Roskin]

On Mon, 2008-06-30 at 03:58 +0200, Javier Martín wrote:
> Here goes a small fix to a grub-setup error that has driven /me crazy
> for the last 4 hours: in the recent split between core_path and
> core_path_dev, one occurrence of the former that should have been turned
> into the latter was not, thus making grub-setup spit lots of nonsensical
> (to me) "error: file not found" messages. I spent a big deal of time
> trying to debug the wrong piece of code, since I stubbornly thought that
> the error was in the "read-and-check" loop, while it really was later in
> the file... Sigh

I understand you were trying to install GRUB to a non-default root.  I'm
sorry for not testing that.

> The fix is so simple that I post it directly here. If a ChangeLog entry
> is necessary, I'd propose "complete core_path variable split" or
> something along that lines.

Actually, it's a real bug, so ChangeLog shouldn't be worded like it's
another cosmetic change like the original patch was meant to be.

I've applied your patch.  Thank you!

-- 
Regards,
Pavel Roskin