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  <address@hidden>
+
+  * 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  <address@hidden>
 
 	* 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 ();