forked from pool/grub2
Michael Chang
c85662cbfa
- Merge changes from SLE12
- add grub2-emu-4-all.patch
* Build 'grub2-emu' wherever possible, to allow a better
implementation of that feature.
- add grub2-s390x-06-loadparm.patch,
- add grub2-commands-introduce-read_file-subcommand.patch:
* allow s390x to telecontrol grub2. (bsc#891946, bsc#892852)
- add grub2-s390x-06-loadparm.patch:
* ignore case and fix transliteration of parameter. (bsc#891946)
- add grub2-s390x-07-add-image-param-for-zipl-setup.patch
* Add --image switch to force zipl update to specific kernel
(bsc#928131)
- add grub2-s390x-08-workaround-part-to-disk.patch
* Ignore partition tables on s390x. (bsc#935127)
- add grub2-efi-chainload-harder.patch:
* allow XEN to be chain-loaded despite firmware flaws. (bnc#887793)
* Do not use shim lock protocol for reading pe header, it won't be
available when secure boot disabled (bsc#943380)
* Make firmware flaw condition be more precisely detected and add
debug message for the case
* Check msdos header to find PE file header (bsc#954126)
- grub2-s390x-04-grub2-install.patch:
* streamline boot to grub menu. (bsc#898198)
* Force '/usr' to read-only before calling kexec. (bsc#932951)
- grub2-once:
* add '--enum' option to enumerate boot-entries in a way
actually understood by 'grub2'. (bsc#892852, bsc#892811)
* Examine variables from grub environment in 'grub2-once'. (fate#319632)
OBS-URL: https://build.opensuse.org/request/show/457610
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=254
16 lines
466 B
Diff
16 lines
466 B
Diff
Index: grub-2.02~beta2/grub-core/osdep/linux/getroot.c
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/grub-core/osdep/linux/getroot.c
|
|
+++ grub-2.02~beta2/grub-core/osdep/linux/getroot.c
|
|
@@ -713,6 +713,10 @@ grub_util_part_to_disk (const char *os_d
|
|
if (! realpath (os_dev, path))
|
|
return NULL;
|
|
|
|
+#ifdef __s390x__
|
|
+ return path;
|
|
+#endif
|
|
+
|
|
if (strncmp ("/dev/", path, 5) == 0)
|
|
{
|
|
char *p = path + 5;
|