a3bdb368a2
- Version bump to 2.06
* rediff
- 0001-add-support-for-UEFI-network-protocols.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- 0003-Make-grub_error-more-verbose.patch
- 0003-bootp-New-net_bootp6-command.patch
- 0005-grub.texi-Add-net_bootp6-doument.patch
- 0006-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
- 0006-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
- 0008-efinet-Setting-DNS-server-from-UEFI-protocol.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- grub-install-force-journal-draining-to-ensure-data-i.patch
- grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
- grub2-diskfilter-support-pv-without-metadatacopies.patch
- grub2-efi-HP-workaround.patch
- grub2-efi-xen-cfg-unquote.patch
- grub2-efi-xen-chainload.patch
- grub2-fix-menu-in-xen-host-server.patch
- grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch
- grub2-install-remove-useless-check-PReP-partition-is-empty.patch
- grub2-lvm-allocate-metadata-buffer-from-raw-contents.patch
- grub2-mkconfig-default-entry-correction.patch
- grub2-pass-corret-root-for-nfsroot.patch
- grub2-s390x-03-output-7-bit-ascii.patch
- grub2-s390x-04-grub2-install.patch
- grub2-secureboot-install-signed-grub.patch
- grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch
- use-grub2-as-a-package-name.patch
* update by patch squashed:
- 0001-Add-support-for-Linux-EFI-stub-loading-on-aarch64.patch
OBS-URL: https://build.opensuse.org/request/show/904721
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=386
77 lines
2.5 KiB
Diff
77 lines
2.5 KiB
Diff
From b57af595c94db6d7babb7623c1530ee4f5b956f0 Mon Sep 17 00:00:00 2001
|
|
From: Michal Suchanek <msuchanek@suse.de>
|
|
Date: Tue, 31 Oct 2017 14:28:54 +0100
|
|
Subject: [PATCH] grub-install: remove useless check PReP partition is empty.
|
|
|
|
References: bsc#1065738
|
|
|
|
The grub-install rewrite in commit cd46aa6cefab checks that the PPeP
|
|
partition does not install an ELF binary before writing grub to it. This
|
|
causes regression in installer scripts that expect to be able to
|
|
reinstall bootloaders without first witping the partition by hand.
|
|
|
|
Fixes: cd46aa6cefab ("Rewrite grub-install, grub-mkrescue,
|
|
grub-mkstandalone and grub-mknetdir ")
|
|
---
|
|
util/grub-install.c | 39 ++-------------------------------------
|
|
1 file changed, 2 insertions(+), 37 deletions(-)
|
|
|
|
Index: grub-2.06~rc1/util/grub-install.c
|
|
===================================================================
|
|
--- grub-2.06~rc1.orig/util/grub-install.c
|
|
+++ grub-2.06~rc1/util/grub-install.c
|
|
@@ -756,34 +756,6 @@ is_prep_partition (grub_device_t dev)
|
|
return 0;
|
|
}
|
|
|
|
-static int
|
|
-is_prep_empty (grub_device_t dev)
|
|
-{
|
|
- grub_disk_addr_t dsize, addr;
|
|
- grub_uint32_t buffer[32768];
|
|
-
|
|
- dsize = grub_disk_native_sectors (dev->disk);
|
|
- for (addr = 0; addr < dsize;
|
|
- addr += sizeof (buffer) / GRUB_DISK_SECTOR_SIZE)
|
|
- {
|
|
- grub_size_t sz = sizeof (buffer);
|
|
- grub_uint32_t *ptr;
|
|
-
|
|
- if (sizeof (buffer) / GRUB_DISK_SECTOR_SIZE > dsize - addr)
|
|
- sz = (dsize - addr) * GRUB_DISK_SECTOR_SIZE;
|
|
- grub_disk_read (dev->disk, addr, 0, sz, buffer);
|
|
-
|
|
- if (addr == 0 && grub_memcmp (buffer, ELFMAG, SELFMAG) == 0)
|
|
- return 1;
|
|
-
|
|
- for (ptr = buffer; ptr < buffer + sz / sizeof (*buffer); ptr++)
|
|
- if (*ptr)
|
|
- return 0;
|
|
- }
|
|
-
|
|
- return 1;
|
|
-}
|
|
-
|
|
static void
|
|
bless (grub_device_t dev, const char *path, int x86)
|
|
{
|
|
@@ -1923,16 +1895,9 @@ main (int argc, char *argv[])
|
|
{
|
|
grub_util_error ("%s", _("the chosen partition is not a PReP partition"));
|
|
}
|
|
- if (is_prep_empty (ins_dev))
|
|
- {
|
|
- if (write_to_disk (ins_dev, imgfile))
|
|
- grub_util_error ("%s", _("failed to copy Grub to the PReP partition"));
|
|
- }
|
|
- else
|
|
+ if (write_to_disk (ins_dev, imgfile))
|
|
{
|
|
- char *s = xasprintf ("dd if=/dev/zero of=%s", install_device);
|
|
- grub_util_error (_("the PReP partition is not empty. If you are sure you want to use it, run dd to clear it: `%s'"),
|
|
- s);
|
|
+ grub_util_error ("%s", _("failed to copy Grub to the PReP partition"));
|
|
}
|
|
grub_device_close (ins_dev);
|
|
if (update_nvram)
|