62e3547e57
- Version bump to 2.04
* removed
- translations-20170427.tar.xz
* grub2.spec
- Make signed grub-tpm.efi specific to x86_64-efi build, the platform
currently shipped with tpm module from upstream codebase
- Add shim_lock to signed grub.efi in x86_64-efi build
- x86_64: linuxefi now depends on linux, both will verify kernel via
shim_lock
- Remove translation tarball and po file hacks as it's been included in
upstream tarball
* rediff
- grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch
- grub2-commands-introduce-read_file-subcommand.patch
- grub2-secureboot-add-linuxefi.patch
- 0001-add-support-for-UEFI-network-protocols.patch
- grub2-efi-HP-workaround.patch
- grub2-secureboot-install-signed-grub.patch
- grub2-linux.patch
- use-grub2-as-a-package-name.patch
- grub2-pass-corret-root-for-nfsroot.patch
- grub2-secureboot-use-linuxefi-on-uefi.patch
- grub2-secureboot-no-insmod-on-sb.patch
- grub2-secureboot-provide-linuxefi-config.patch
- grub2-secureboot-chainloader.patch
- grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-s390x-04-grub2-install.patch
- grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
- grub2-efi-chainloader-root.patch
OBS-URL: https://build.opensuse.org/request/show/741033
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=340
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
|
|
V2: Add fs_ prefix to fs functions by upstream commit ad4bfee
|
|
|
|
Index: grub-2.04/util/setup.c
|
|
===================================================================
|
|
--- grub-2.04.orig/util/setup.c
|
|
+++ grub-2.04/util/setup.c
|
|
@@ -526,8 +526,42 @@ SETUP (const char *dir,
|
|
err = grub_util_ldm_embed (dest_dev->disk, &nsec, maxsec,
|
|
GRUB_EMBED_PCBIOS, §ors);
|
|
else if (ctx.dest_partmap)
|
|
- err = ctx.dest_partmap->embed (dest_dev->disk, &nsec, maxsec,
|
|
- GRUB_EMBED_PCBIOS, §ors);
|
|
+ {
|
|
+ err = ctx.dest_partmap->embed (dest_dev->disk, &nsec, maxsec,
|
|
+ GRUB_EMBED_PCBIOS, §ors);
|
|
+#ifdef GRUB_SETUP_BIOS
|
|
+ if ((err == GRUB_ERR_OUT_OF_RANGE || err == GRUB_ERR_FILE_NOT_FOUND)
|
|
+ && dest_dev->disk->id == root_dev->disk->id
|
|
+ && dest_dev->disk->dev->id == root_dev->disk->dev->id)
|
|
+ {
|
|
+ grub_fs_t root_fs;
|
|
+
|
|
+ root_fs = grub_fs_probe (root_dev);
|
|
+ if (root_fs && root_fs->fs_embed)
|
|
+ {
|
|
+ grub_disk_addr_t *fs_sectors;
|
|
+ unsigned int fs_nsec;
|
|
+
|
|
+ fs_sectors = NULL;
|
|
+ fs_nsec = core_sectors;
|
|
+ err = root_fs->fs_embed (root_dev, &fs_nsec, maxsec,
|
|
+ GRUB_EMBED_PCBIOS, &fs_sectors);
|
|
+ if (!err && fs_nsec >= core_sectors)
|
|
+ {
|
|
+ sectors = fs_sectors;
|
|
+ nsec = fs_nsec;
|
|
+ ctx.container = root_dev->disk->partition;
|
|
+ core_dev = root_dev;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ if (fs_sectors)
|
|
+ grub_free (fs_sectors);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+#endif
|
|
+ }
|
|
else
|
|
err = fs->fs_embed (dest_dev, &nsec, maxsec,
|
|
GRUB_EMBED_PCBIOS, §ors);
|
|
@@ -639,7 +673,7 @@ SETUP (const char *dir,
|
|
|
|
/* Write the core image onto the disk. */
|
|
for (i = 0; i < nsec; i++)
|
|
- grub_disk_write (dest_dev->disk, sectors[i], 0,
|
|
+ grub_disk_write (core_dev->disk, sectors[i], 0,
|
|
GRUB_DISK_SECTOR_SIZE,
|
|
core_img + i * GRUB_DISK_SECTOR_SIZE);
|
|
#endif
|