summaryrefslogtreecommitdiffstats
path: root/lib/MGA/DrakISO
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-03-17 13:12:26 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-03-17 13:12:26 +0000
commitc6dd77e2cc4c79b33579a062afe19c3d50bc536a (patch)
tree213c91b5c6a0cbeca96656f502fb29d12b5ba8f4 /lib/MGA/DrakISO
parentb99684a3efafea61bad4c43095f56d04623d04f9 (diff)
downloaddrakiso-c6dd77e2cc4c79b33579a062afe19c3d50bc536a.tar
drakiso-c6dd77e2cc4c79b33579a062afe19c3d50bc536a.tar.gz
drakiso-c6dd77e2cc4c79b33579a062afe19c3d50bc536a.tar.bz2
drakiso-c6dd77e2cc4c79b33579a062afe19c3d50bc536a.tar.xz
drakiso-c6dd77e2cc4c79b33579a062afe19c3d50bc536a.zip
Fix support for dual 32/64 bit EFI.
Diffstat (limited to 'lib/MGA/DrakISO')
-rw-r--r--lib/MGA/DrakISO/BuildBoot.pm4
1 files changed, 2 insertions, 2 deletions
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 . '/');