summaryrefslogtreecommitdiffstats
path: root/lib/MGA/DrakISO/BuildISO.pm
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-03-17 12:12:19 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-03-17 12:12:19 +0000
commitb99684a3efafea61bad4c43095f56d04623d04f9 (patch)
treeaa1ee96f8a2a73c6061afa34fd11daecca9b3d60 /lib/MGA/DrakISO/BuildISO.pm
parent8834463bdd43dab422016b720b42eb1869e4192f (diff)
downloaddrakiso-b99684a3efafea61bad4c43095f56d04623d04f9.tar
drakiso-b99684a3efafea61bad4c43095f56d04623d04f9.tar.gz
drakiso-b99684a3efafea61bad4c43095f56d04623d04f9.tar.bz2
drakiso-b99684a3efafea61bad4c43095f56d04623d04f9.tar.xz
drakiso-b99684a3efafea61bad4c43095f56d04623d04f9.zip
Support 32-bit EFI with 64-bit system (and vice-versa).
Diffstat (limited to 'lib/MGA/DrakISO/BuildISO.pm')
-rw-r--r--lib/MGA/DrakISO/BuildISO.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/MGA/DrakISO/BuildISO.pm b/lib/MGA/DrakISO/BuildISO.pm
index 0042b43..f4278b1 100644
--- a/lib/MGA/DrakISO/BuildISO.pm
+++ b/lib/MGA/DrakISO/BuildISO.pm
@@ -46,13 +46,15 @@ our @EXPORT = qw(build_iso);
sub build_iso {
my ($build) = @_;
+ my $efi_type = $build->{media}{efi_type} // 'none';
+
my $loopbacks = $build->get_build_dir('loopbacks');
my $files = $build->get_build_dir('files');
build_iso_image(
$build,
'/boot=' . $build->get_build_dir('boot'),
- if_($build->{settings}{arch} eq 'x86_64',
+ if_($efi_type ne 'none',
'/EFI=' . $build->get_build_dir('EFI'),
),
if_(-d $loopbacks,
@@ -99,11 +101,12 @@ sub build_iso_image {
my $arch = $build->{settings}{arch};
+ my $efi_type = $build->{media}{efi_type} // 'none';
+
my $mbr_image = $build->get_absolute_path($build->{media}{mbr_boot_img}) // '/usr/lib/grub/i386-pc/boot_hybrid.img';
-e $mbr_image or die "ERROR: cannot find MBR boot image $mbr_image\n";
my $esp_image = $build->get_build_dir('images') . '/esp.img';
- -e $esp_image || $arch ne 'x86_64' or die "ERROR: cannot find ESP image $esp_image\n";
my $build_dir = $build->get_build_dir('dist');
mkdir_p($build_dir);
@@ -136,7 +139,7 @@ sub build_iso_image {
'-boot-load-size', 4,
'-boot-info-table',
'--grub2-boot-info',
- if_(!$build->{media}{legacy_boot_only},
+ if_($efi_type ne 'none',
# for DVD UEFI boot
'--efi-boot', '--interval:appended_partition_2:all::',
# for USB UEFI boot