summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-03 19:28:57 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-03 19:28:57 +0000
commite2917751442951073d36dadafefebe2de3148892 (patch)
treea8e6831528ed13ff0cfb593137b2850db8c7403d
parent569c82a8a35a5becc7f0f85fc396984c5a4ae85b (diff)
downloaddrakiso-e2917751442951073d36dadafefebe2de3148892.tar
drakiso-e2917751442951073d36dadafefebe2de3148892.tar.gz
drakiso-e2917751442951073d36dadafefebe2de3148892.tar.bz2
drakiso-e2917751442951073d36dadafefebe2de3148892.tar.xz
drakiso-e2917751442951073d36dadafefebe2de3148892.zip
Don't look for ESP image when creating a 32-bit ISO.
-rw-r--r--lib/MGA/DrakISO/BuildISO.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/MGA/DrakISO/BuildISO.pm b/lib/MGA/DrakISO/BuildISO.pm
index 96f9564..54edaff 100644
--- a/lib/MGA/DrakISO/BuildISO.pm
+++ b/lib/MGA/DrakISO/BuildISO.pm
@@ -98,11 +98,13 @@ sub list_selected_loopbacks {
sub build_iso_image {
my ($build, @opts) = @_;
+ my $arch = $build->{settings}{arch};
+
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 "cannot find MBR boot image $mbr_image\n";
my $esp_image = $build->get_builddir('images') . '/esp.img';
- -e $esp_image or die "cannot find ESP image $esp_image\n";
+ -e $esp_image || $arch ne 'x86_64' or die "cannot find ESP image $esp_image\n";
my $build_dir = $build->get_builddir('dist');
mkdir_p($build_dir);
@@ -135,7 +137,7 @@ sub build_iso_image {
'-boot-load-size', 4,
'-boot-info-table',
'--grub2-boot-info',
- if_($build->{settings}{arch} eq 'x86_64',
+ if_($arch eq 'x86_64',
# for DVD UEFI boot
'--efi-boot', '--interval:appended_partition_2:all::',
# for USB UEFI boot