You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
1.0 KiB
27 lines
1.0 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: RHEL Ninjas <example@example.com> |
|
Date: Mon, 13 Apr 2015 12:42:53 +1000 |
|
Subject: [PATCH] don't strip fw_path twice for EFI network boot |
|
|
|
--- |
|
grub-core/kern/efi/init.c | 7 ++++++- |
|
1 file changed, 6 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c |
|
index 942ab0256b9..c391df48236 100644 |
|
--- a/grub-core/kern/efi/init.c |
|
+++ b/grub-core/kern/efi/init.c |
|
@@ -61,7 +61,12 @@ grub_machine_get_bootlocation (char **device, char **path) |
|
*device = grub_efidisk_get_device_name (image->device_handle); |
|
*path = grub_efi_get_filename (image->file_path); |
|
if (!*device && grub_efi_net_config) |
|
- grub_efi_net_config (image->device_handle, device, path); |
|
+ { |
|
+ grub_efi_net_config (image->device_handle, device, path); |
|
+ /* grub_efi_net_config returns the directory path, not the boot filename, |
|
+ so don't strip any further. */ |
|
+ return; |
|
+ } |
|
|
|
/* Get the directory. */ |
|
p = grub_strrchr (*path, '/');
|
|
|