From ea38384b70f455ff99a4bc420dd63cba49f80451 Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Fri, 9 May 2014 13:54:47 +0200
Subject: Apple detection fixes

---
 backend/modules/bootloader | 2 +-
 backend/modules/install    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/modules/bootloader b/backend/modules/bootloader
index ac5185b..7f74e82 100644
--- a/backend/modules/bootloader
+++ b/backend/modules/bootloader
@@ -88,7 +88,7 @@ function install_grub()
     # install grub
     mkdir -p "$TARGET/boot/grub"
     if [ -d /sys/firmware/efi ]; then
-        if is_removeable "$cfg_bootloader_target" && [ "$apple" = 1 ]; then
+        if is_removeable "$cfg_bootloader_target" || [ "$apple" = 1 ]; then
             chroot_it grub-install --removeable &>/dev/null
         else
             chroot_it grub-install &>/dev/null
diff --git a/backend/modules/install b/backend/modules/install
index 4d63fec..852861a 100644
--- a/backend/modules/install
+++ b/backend/modules/install
@@ -27,7 +27,7 @@ function prepare_target()
 
     # add EFI bootloader target to hdmap
     if [ -d /sys/firmware/efi ]; then
-        efi_part="$(get_disk "$cfg_bootloader_target")"
+        efi_part="$cfg_bootloader_target"
         if [ "$efi_part" ]; then
             hdmap_set "$efi_part:/boot/efi::auto"
         fi
-- 
cgit v1.0