mirror of
https://git.proxmox.com/git/grub2
synced 2025-07-25 06:52:53 +00:00
c3f791031d
- Ensure uniqueness of RAID array numbers even if some elements have a
name (closes: #609804).
- Remove unnecessary brackets from tr arguments (closes: #612564).
- Add grub-mkrescue info documentation (closes: #612585).
- Avoid generating invalid configuration when something that looks like
a Xen hypervisor is present without any Xen kernels (closes: #612898).
- Fix memory alignment when calling 'linux' multiple times on EFI
(closes: #616638).
- Fix grub-install on amd64 EFI systems (closes: #617388).
- Automatically export pager variable (closes: #612995).
- Fix parser error with "time" (closes: #612991).
- Ignore case of bitmap extensions (closes: #611123).
- Skip vmlinux-* on x86 platforms (closes: #536846, #546008).
- Accept old-style Xen kernels (closes: #610428).
- Skip damaged LVM volumes (closes: #544731).
- Handle LVM mirroring (closes: #598441).
- Detect spares and report them as not RAID members (closes: #611561).
- Don't enable localisation unless gfxterm is available (closes:
#604609).
- Fix partitioned RAID support (closes: #595071, #613444).
- Dynamically count the number of lines for the lower banner (closes:
#606494).
- Improve quoting in grub-mkconfig, to support background image file
names containing spaces (closes: #612417).
- Flush BIOS disk devices more accurately (closes: #623124).
* Update branch_embed-sectors.patch:
- Detect sector used by HighPoint RAID controller (closes: #394868).
32 lines
918 B
Diff
32 lines
918 B
Diff
Index: b/util/grub-setup.c
|
|
===================================================================
|
|
--- a/util/grub-setup.c
|
|
+++ b/util/grub-setup.c
|
|
@@ -76,6 +76,7 @@
|
|
|
|
#define DEFAULT_BOOT_FILE "boot.img"
|
|
#define DEFAULT_CORE_FILE "core.img"
|
|
+#define CORE_IMG_IN_FS "setup_left_core_image_in_filesystem"
|
|
|
|
#ifdef GRUB_MACHINE_SPARC64
|
|
#define grub_target_to_host16(x) grub_be_to_cpu16(x)
|
|
@@ -489,6 +490,8 @@
|
|
|
|
grub_free (sectors);
|
|
|
|
+ unlink (DEFAULT_DIRECTORY "/" CORE_IMG_IN_FS);
|
|
+
|
|
goto finish;
|
|
}
|
|
#endif
|
|
@@ -514,6 +517,9 @@
|
|
/* The core image must be put on a filesystem unfortunately. */
|
|
grub_util_info ("will leave the core image on the filesystem");
|
|
|
|
+ fp = fopen (DEFAULT_DIRECTORY "/" CORE_IMG_IN_FS, "w");
|
|
+ fclose (fp);
|
|
+
|
|
/* Make sure that GRUB reads the identical image as the OS. */
|
|
tmp_img = xmalloc (core_size);
|
|
core_path_dev_full = grub_util_get_path (dir, core_file);
|