9a4054fb1c
Resolves: rhbz#1344700 - Make chainloader code work right when shim is absent or disabled Resolves: rhbz#1344512 Signed-off-by: Peter Jones <pjones@redhat.com>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 9d47b2c482b6db238c99fe106f4b2e3c612f3a91 Mon Sep 17 00:00:00 2001
|
|
From: Raymund Will <rw@suse.com>
|
|
Date: Fri, 10 Apr 2015 01:45:02 -0400
|
|
Subject: [PATCH 69/83] Use device part of chainloader target, if present.
|
|
|
|
Otherwise chainloading is restricted to '$root', which might not even
|
|
be readable by EFI!
|
|
|
|
v1. use grub_file_get_device_name() to get device name
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/loader/efi/chainloader.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
|
|
index 522a716..6b47497 100644
|
|
--- a/grub-core/loader/efi/chainloader.c
|
|
+++ b/grub-core/loader/efi/chainloader.c
|
|
@@ -219,8 +219,11 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
|
|
if (! file)
|
|
goto fail;
|
|
|
|
- /* Get the root device's device path. */
|
|
- dev = grub_device_open (0);
|
|
+ /* Get the device path from filename. */
|
|
+ char *devname = grub_file_get_device_name (filename);
|
|
+ dev = grub_device_open (devname);
|
|
+ if (devname)
|
|
+ grub_free (devname);
|
|
if (! dev)
|
|
goto fail;
|
|
|
|
--
|
|
2.7.4
|
|
|