summaryrefslogtreecommitdiff
path: root/sys-boot/grub/files/ubuntu-upstream-1.98/902_boot_blocklist_hack.diff
blob: 63caf45ed6b6255638c371f53066c34c23f80aa3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
Index: util/i386/pc/grub-setup.c
===================================================================
--- util/i386/pc/grub-setup.c	(revision 1836)
+++ util/i386/pc/grub-setup.c	(working copy)
@@ -383,6 +383,15 @@
       grub_disk_cache_invalidate_all ();

       file = grub_file_open (core_path_dev);
+
+      if (grub_errno == GRUB_ERR_FILE_NOT_FOUND)
+	{
+	  /* Clean the previous grub_errno */
+	  grub_errno = GRUB_ERR_NONE;
+	  strcpy (core_path_dev, "/grub/core.img");
+	  file = grub_file_open (core_path_dev);
+	}
+
       if (file)
 	{
 	  if (grub_file_size (file) != core_size)