Blame SOURCES/0177-don-t-strip-fw_path-twice-for-EFI-network-boot.patch

a85e8e
From 224bdbee2e9cc9a9aaa198cec9b984bb1fa0ee73 Mon Sep 17 00:00:00 2001
a85e8e
From: RHEL Ninjas <example@example.com>
a85e8e
Date: Mon, 13 Apr 2015 12:42:53 +1000
a85e8e
Subject: [PATCH 177/260] don't strip fw_path twice for EFI network boot
a85e8e
a85e8e
---
a85e8e
 grub-core/kern/efi/init.c | 7 ++++++-
a85e8e
 1 file changed, 6 insertions(+), 1 deletion(-)
a85e8e
a85e8e
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
a85e8e
index 942ab0256..c391df482 100644
a85e8e
--- a/grub-core/kern/efi/init.c
a85e8e
+++ b/grub-core/kern/efi/init.c
a85e8e
@@ -61,7 +61,12 @@ grub_machine_get_bootlocation (char **device, char **path)
a85e8e
   *device = grub_efidisk_get_device_name (image->device_handle);
a85e8e
   *path = grub_efi_get_filename (image->file_path);
a85e8e
   if (!*device && grub_efi_net_config)
a85e8e
-    grub_efi_net_config (image->device_handle, device, path);
a85e8e
+    {
a85e8e
+      grub_efi_net_config (image->device_handle, device, path);
a85e8e
+      /* grub_efi_net_config returns the directory path, not the boot filename,
a85e8e
+         so don't strip any further. */
a85e8e
+      return;
a85e8e
+    }
a85e8e
 
a85e8e
   /* Get the directory.  */
a85e8e
   p = grub_strrchr (*path, '/');
a85e8e
-- 
a85e8e
2.13.0
a85e8e