[PATCH] Small fix in i386 grub-setup

[PATCH] Small fix in i386 grub-setup

[Javier Martín]

[-- Attachment #1.1: Type: text/plain, Size: 372 bytes --]

Hi there - I have found that a grub-setup in i386 recently got borked,
and now inserts the core.img filename twice in the path while looking
for it the second time: the program tried to find the file
"/boot/grubcore.img/core.img" which is obviously wrong. This is a fix,
or so I think - it seems the right thing given the function prototype
and it works for me.



[-- Attachment #1.2: grub_setup.diff --]
[-- Type: text/x-patch, Size: 679 bytes --]

Index: util/i386/pc/grub-setup.c
===================================================================
RCS file: /sources/grub/grub2/util/i386/pc/grub-setup.c,v
retrieving revision 1.37
diff -u -r1.37 grub-setup.c
--- util/i386/pc/grub-setup.c	18 Jun 2008 17:35:26 -0000	1.37
+++ util/i386/pc/grub-setup.c	19 Jun 2008 11:19:57 -0000
@@ -368,7 +368,7 @@
   
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
-  core_path = grub_util_get_path (DEFAULT_DIRECTORY "core.img", core_file);
+  core_path = grub_util_get_path (DEFAULT_DIRECTORY, core_file);
   
   /* It is a Good Thing to sync two times.  */
   sync ();

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

Re: [PATCH] Small fix in i386 grub-setup

[Robert Millan]

On Thu, Jun 19, 2008 at 01:22:11PM +0200, Javier Martín wrote:
> Hi there - I have found that a grub-setup in i386 recently got borked,
> and now inserts the core.img filename twice in the path while looking
> for it the second time: the program tried to find the file
> "/boot/grubcore.img/core.img" which is obviously wrong. This is a fix,
> or so I think - it seems the right thing given the function prototype
> and it works for me.

Thanks.  Please could you include a ChangeLog entry?

-- 
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 /.)

Re: [PATCH] Small fix in i386 grub-setup

[Javier Martín]

[-- Attachment #1.1: Type: text/plain, Size: 695 bytes --]

El jue, 19-06-2008 a las 14:21 +0200, Robert Millan escribió:
> On Thu, Jun 19, 2008 at 01:22:11PM +0200, Javier Martín wrote:
> > Hi there - I have found that a grub-setup in i386 recently got borked,
> > and now inserts the core.img filename twice in the path while looking
> > for it the second time: the program tried to find the file
> > "/boot/grubcore.img/core.img" which is obviously wrong. This is a fix,
> > or so I think - it seems the right thing given the function prototype
> > and it works for me.
> 
> Thanks.  Please could you include a ChangeLog entry?
> 

Erm, ok... I didn't know if I just had to write it here or include it in
the patch, so I did the latter

[-- Attachment #1.2: grub_setup.diff --]
[-- Type: text/x-patch, Size: 1311 bytes --]

Index: ChangeLog
===================================================================
RCS file: /sources/grub/grub2/ChangeLog,v
retrieving revision 1.727
diff -u -r1.727 ChangeLog
--- ChangeLog	19 Jun 2008 13:09:16 -0000	1.727
+++ ChangeLog	19 Jun 2008 13:31:33 -0000
@@ -1,3 +1,8 @@
+2008-06-19  Javier Martín  <lordhabbit@gmail.com>
+
+  * util/i386/pc-grub-setup.c (setup): Remove literal "core.img" in a call to
+  resolve the core image location that effectively appended the name twice.
+
 2008-06-19  Robert Millan  <rmh@aybabtu.com>
 
 	* commands/search.c (search_label, search_fs_uuid, search_file): Print
Index: util/i386/pc/grub-setup.c
===================================================================
RCS file: /sources/grub/grub2/util/i386/pc/grub-setup.c,v
retrieving revision 1.37
diff -u -r1.37 grub-setup.c
--- util/i386/pc/grub-setup.c	18 Jun 2008 17:35:26 -0000	1.37
+++ util/i386/pc/grub-setup.c	19 Jun 2008 13:31:34 -0000
@@ -368,7 +368,7 @@
   
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
-  core_path = grub_util_get_path (DEFAULT_DIRECTORY "core.img", core_file);
+  core_path = grub_util_get_path (DEFAULT_DIRECTORY, core_file);
   
   /* It is a Good Thing to sync two times.  */
   sync ();

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

Re: [PATCH] Small fix in i386 grub-setup

[Javier Martín]

[-- Attachment #1.1: Type: text/plain, Size: 724 bytes --]

El jue, 19-06-2008 a las 14:21 +0200, Robert Millan escribió:
> On Thu, Jun 19, 2008 at 01:22:11PM +0200, Javier Martín wrote:
> > Hi there - I have found that a grub-setup in i386 recently got borked,
> > and now inserts the core.img filename twice in the path while looking
> > for it the second time: the program tried to find the file
> > "/boot/grubcore.img/core.img" which is obviously wrong. This is a fix,
> > or so I think - it seems the right thing given the function prototype
> > and it works for me.
> 
> Thanks.  Please could you include a ChangeLog entry?
> 

Oops. There's a small typo in my ChangeLog entry (pc-grub-setup.c
instead of pc/grub-setup.c). It has been corrected in this version

[-- Attachment #1.2: grub_setup.diff --]
[-- Type: text/x-patch, Size: 1311 bytes --]

Index: ChangeLog
===================================================================
RCS file: /sources/grub/grub2/ChangeLog,v
retrieving revision 1.727
diff -u -r1.727 ChangeLog
--- ChangeLog	19 Jun 2008 13:09:16 -0000	1.727
+++ ChangeLog	19 Jun 2008 13:31:33 -0000
@@ -1,3 +1,8 @@
+2008-06-19  Javier Martín  <lordhabbit@gmail.com>
+
+  * util/i386/pc/grub-setup.c (setup): Remove literal "core.img" in a call to
+  resolve the core image location that effectively appended the name twice.
+
 2008-06-19  Robert Millan  <rmh@aybabtu.com>
 
 	* commands/search.c (search_label, search_fs_uuid, search_file): Print
Index: util/i386/pc/grub-setup.c
===================================================================
RCS file: /sources/grub/grub2/util/i386/pc/grub-setup.c,v
retrieving revision 1.37
diff -u -r1.37 grub-setup.c
--- util/i386/pc/grub-setup.c	18 Jun 2008 17:35:26 -0000	1.37
+++ util/i386/pc/grub-setup.c	19 Jun 2008 13:31:34 -0000
@@ -368,7 +368,7 @@
   
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
-  core_path = grub_util_get_path (DEFAULT_DIRECTORY "core.img", core_file);
+  core_path = grub_util_get_path (DEFAULT_DIRECTORY, core_file);
   
   /* It is a Good Thing to sync two times.  */
   sync ();

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

Re: [PATCH] Small fix in i386 grub-setup

[Robert Millan]

On Thu, Jun 19, 2008 at 03:46:07PM +0200, Javier Martín wrote:
> El jue, 19-06-2008 a las 14:21 +0200, Robert Millan escribió:
> > On Thu, Jun 19, 2008 at 01:22:11PM +0200, Javier Martín wrote:
> > > Hi there - I have found that a grub-setup in i386 recently got borked,
> > > and now inserts the core.img filename twice in the path while looking
> > > for it the second time: the program tried to find the file
> > > "/boot/grubcore.img/core.img" which is obviously wrong. This is a fix,
> > > or so I think - it seems the right thing given the function prototype
> > > and it works for me.
> > 
> > Thanks.  Please could you include a ChangeLog entry?
> > 
> 
> Oops. There's a small typo in my ChangeLog entry (pc-grub-setup.c
> instead of pc/grub-setup.c). It has been corrected in this version

Committed, thank you.

-- 
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 /.)

Re: [PATCH] Small fix in i386 grub-setup

[Robert Millan]

On Thu, Jun 19, 2008 at 03:36:46PM +0200, Javier Martín wrote:
> > 
> > Thanks.  Please could you include a ChangeLog entry?
> 
> Erm, ok... I didn't know if I just had to write it here or include it in
> the patch, so I did the latter

I think it's better to include it here (or in the patch header) instead of
making it part of the patch, because otherwise it tends to break when ChangeLog
changes.

But then again, it's no big deal ;-)

-- 
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 /.)