From cd3e6a97de25fe36ab458f05bb5e146a9596b519 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Fri, 20 Feb 2015 00:32:46 +0100
Subject: [PATCH] [bootloader] move efi_(boot_loader|directory) to proper place

---
 src/modules/bootloader/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 4801a40e0..53f1a1368 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -150,9 +150,9 @@ def install_grub(efi_directory, fw_type):
 
 
 def prepare_bootloader(fw_type):
+    efi_directory = libcalamares.globalstorage.value("efiSystemPartition")
+    efi_boot_loader = libcalamares.job.configuration["efiBootLoader"]
     if fw_type == "efi":
-        efi_boot_loader = libcalamares.job.configuration["efiBootLoader"]
-        efi_directory = libcalamares.globalstorage.value("efiSystemPartition")
         partitions = libcalamares.globalstorage.value("partitions")
         boot_p = ""
         device = ""