From c6dd77e2cc4c79b33579a062afe19c3d50bc536a Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 17 Mar 2018 13:12:26 +0000
Subject: Fix support for dual 32/64 bit EFI.

---
 examples/gui/config/build.cfg     | 4 ++--
 examples/minimal/config/build.cfg | 4 ++--
 examples/xfce/config/build.cfg    | 4 ++--
 lib/MGA/DrakISO/BuildBoot.pm      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg
index b21b5fd..bb95e5d 100644
--- a/examples/gui/config/build.cfg
+++ b/examples/gui/config/build.cfg
@@ -205,11 +205,11 @@ my $_l = {
         eltorito_img        => '/usr/share/drakiso-bootloader/images/eltorito.img',
         if_($arch eq 'i586',
             efi_type        => '32bit',
-            boot_efi        => '/usr/share/drakiso-bootloader/images/bootia32.efi' 
+            boot32_efi      => '/usr/share/drakiso-bootloader/images/bootia32.efi'
         ),
         if_($arch eq 'x86_64',
             efi_type        => '64bit',
-            boot_efi        => '/usr/share/drakiso-bootloader/images/bootx64.efi'
+            boot64_efi      => '/usr/share/drakiso-bootloader/images/bootx64.efi'
         ),
     },
     mount => MGA::DrakISO::Mounts::volatile_squash_union(),
diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg
index 079c5f6..79e2fe8 100644
--- a/examples/minimal/config/build.cfg
+++ b/examples/minimal/config/build.cfg
@@ -181,11 +181,11 @@ my $_l = {
         eltorito_img        => '/usr/share/drakiso-bootloader/images/eltorito.img',
         if_($arch eq 'i586',
             efi_type        => '32bit',
-            boot_efi        => '/usr/share/drakiso-bootloader/images/bootia32.efi' 
+            boot32_efi      => '/usr/share/drakiso-bootloader/images/bootia32.efi'
         ),
         if_($arch eq 'x86_64',
             efi_type        => '64bit',
-            boot_efi        => '/usr/share/drakiso-bootloader/images/bootx64.efi'
+            boot64_efi      => '/usr/share/drakiso-bootloader/images/bootx64.efi'
         ),
     },
     mount => MGA::DrakISO::Mounts::volatile_squash_union(),
diff --git a/examples/xfce/config/build.cfg b/examples/xfce/config/build.cfg
index 7e99cab..6b180cc 100644
--- a/examples/xfce/config/build.cfg
+++ b/examples/xfce/config/build.cfg
@@ -255,11 +255,11 @@ my $_l = {
         eltorito_img        => '/usr/share/drakiso-bootloader/images/eltorito.img',
         if_($arch eq 'i586',
             efi_type        => '32bit',
-            boot_efi        => '/usr/share/drakiso-bootloader/images/bootia32.efi' 
+            boot32_efi      => '/usr/share/drakiso-bootloader/images/bootia32.efi'
         ),
         if_($arch eq 'x86_64',
             efi_type        => '64bit',
-            boot_efi        => '/usr/share/drakiso-bootloader/images/bootx64.efi'
+            boot64_efi      => '/usr/share/drakiso-bootloader/images/bootx64.efi'
         ),
     },
     mount => MGA::DrakISO::Mounts::volatile_squash_union(),
diff --git a/lib/MGA/DrakISO/BuildBoot.pm b/lib/MGA/DrakISO/BuildBoot.pm
index 89e4fc2..69d989c 100644
--- a/lib/MGA/DrakISO/BuildBoot.pm
+++ b/lib/MGA/DrakISO/BuildBoot.pm
@@ -237,7 +237,7 @@ sub prepare_iso_bootloader {
     if ($efi_type ne '64bit') {
         # If the user has supplied a grub2 image for 32-bit UEFI boot, copy that,
         # otherwise build one.
-        my $boot_efi = $build->get_absolute_path($build->{media}{bootia32_efi});
+        my $boot_efi = $build->get_absolute_path($build->{media}{boot32_efi});
         if (defined $boot_efi) {
             -e $boot_efi or die "ERROR: cannot find EFI boot image $boot_efi\n";
             cp_f($boot_efi, $efi_boot_dir . '/');
@@ -249,7 +249,7 @@ sub prepare_iso_bootloader {
     if ($efi_type ne '32bit') {
         # If the user has supplied a grub2 image for 64-bit UEFI boot, copy that,
         # otherwise build one.
-        my $boot_efi = $build->get_absolute_path($build->{media}{boot_efi});
+        my $boot_efi = $build->get_absolute_path($build->{media}{boot64_efi});
         if (defined $boot_efi) {
             -e $boot_efi or die "ERROR: cannot find EFI boot image $boot_efi\n";
             cp_f($boot_efi, $efi_boot_dir . '/');
-- 
cgit v1.2.1