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
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From 151b1691fe0cf885df101c6e6a7cb1defc50428b Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 16 Jul 2012 18:57:11 -0400
|
|
Subject: [PATCH] Use "linuxefi" and "initrdefi" where appropriate
|
|
|
|
References: fate#314485
|
|
Patch-Mainline: no
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
---
|
|
util/grub.d/10_linux.in | 18 ++++++++++++++++--
|
|
1 files changed, 16 insertions(+), 2 deletions(-)
|
|
|
|
Index: grub-2.04~rc1/util/grub.d/10_linux.in
|
|
===================================================================
|
|
--- grub-2.04~rc1.orig/util/grub.d/10_linux.in
|
|
+++ grub-2.04~rc1/util/grub.d/10_linux.in
|
|
@@ -145,10 +145,17 @@ linux_entry ()
|
|
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
|
fi
|
|
message="$(gettext_printf "Loading Linux %s ..." ${version})"
|
|
- sed "s/^/$submenu_indentation/" << EOF
|
|
+ if [ -d /sys/firmware/efi ]; then
|
|
+ sed "s/^/$submenu_indentation/" << EOF
|
|
+ echo '$(echo "$message" | grub_quote)'
|
|
+ linuxefi ${rel_dirname}/${basename} ${root_device} ${args}
|
|
+EOF
|
|
+ else
|
|
+ sed "s/^/$submenu_indentation/" << EOF
|
|
echo '$(echo "$message" | grub_quote)'
|
|
linux ${rel_dirname}/${basename} ${root_device} ${args}
|
|
EOF
|
|
+ fi
|
|
if test -n "${initrd}" ; then
|
|
# TRANSLATORS: ramdisk isn't identifier. Should be translated.
|
|
message="$(gettext_printf "Loading initial ramdisk ...")"
|
|
@@ -156,10 +163,17 @@ EOF
|
|
for i in ${initrd}; do
|
|
initrd_path="${initrd_path} ${rel_dirname}/${i}"
|
|
done
|
|
- sed "s/^/$submenu_indentation/" << EOF
|
|
+ if [ -d /sys/firmware/efi ]; then
|
|
+ sed "s/^/$submenu_indentation/" << EOF
|
|
+ echo '$(echo "$message" | grub_quote)'
|
|
+ initrdefi $(echo $initrd_path)
|
|
+EOF
|
|
+ else
|
|
+ sed "s/^/$submenu_indentation/" << EOF
|
|
echo '$(echo "$message" | grub_quote)'
|
|
initrd $(echo $initrd_path)
|
|
EOF
|
|
+ fi
|
|
fi
|
|
sed "s/^/$submenu_indentation/" << EOF
|
|
}
|