proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-08-09 20:02:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Copy the partition table zone if floppy support is disabled, even if

Browse Source 
no partition table is found (LP: #741867).
This commit is contained in:
Colin Watson 2011-03-29 11:37:30 +01:00
parent 31428afbc2
commit fb77a3a964
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -4,6 +4,8 @@ grub2 (1.99~rc1-7) UNRELEASED; urgency=low
/dev/disk/by-uuid/ to bug reports, by request of upstream.
* Cherry-pick from upstream:
- Use libgeom on FreeBSD to detect partitions (closes: #612128).
- Copy the partition table zone if floppy support is disabled, even if
no partition table is found (LP: #741867).
-- Colin Watson <cjwatson@debian.org> Mon, 28 Mar 2011 23:47:28 +0100

46
debian/patches/copy_partition_table.patch vendored Normal file
View File

@ -0,0 +1,46 @@
Description: Always copy partition table zone if floppy support is disabled
Do this even if no partition table is found. Otherwise, the BIOS on Dell
Latitude E series laptops will freeze during POST if an invalid partition
table is contained in the PBR of the active partition when GRUB is
installed to a partition.
Author: Mario Limonciello <Mario_Limonciello@Dell.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/741867
Forwarded: http://lists.gnu.org/archive/html/grub-devel/2011-03/msg00062.html
Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/3123
Last-Update: 2011-03-29
Index: b/util/grub-setup.c
===================================================================
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -400,6 +400,15 @@
}
#endif
+ /* Copy the partition table. */
+ if (dest_partmap ||
+ (!allow_floppy && !grub_util_biosdisk_is_floppy (dest_dev->disk)))
+ memcpy (boot_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
+ tmp_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
+ GRUB_BOOT_MACHINE_PART_END - GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC);
+
+ free (tmp_img);
+
if (! dest_partmap)
{
grub_util_warn (_("Attempting to install GRUB to a partitionless disk or to a partition. This is a BAD idea."));
@@ -411,14 +420,6 @@
goto unable_to_embed;
}
- /* Copy the partition table. */
- if (dest_partmap)
- memcpy (boot_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
- tmp_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
- GRUB_BOOT_MACHINE_PART_END - GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC);
-
- free (tmp_img);
-
if (!dest_partmap->embed)
{
grub_util_warn ("Partition style '%s' doesn't support embeding",

1
debian/patches/series vendored
View File

@ -23,3 +23,4 @@ normal_menu_line_alloc.patch
freebsd_module_header_alloc.patch
video_fb_pageflip.patch
kfreebsd_libgeom.patch
copy_partition_table.patch