diff options
Diffstat (limited to 'lib/MGA/DrakISO/BuildISO.pm')
-rw-r--r-- | lib/MGA/DrakISO/BuildISO.pm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/MGA/DrakISO/BuildISO.pm b/lib/MGA/DrakISO/BuildISO.pm index f4278b1..09096a7 100644 --- a/lib/MGA/DrakISO/BuildISO.pm +++ b/lib/MGA/DrakISO/BuildISO.pm @@ -26,7 +26,6 @@ package MGA::DrakISO::BuildISO; use strict; use MDK::Common; -use common; use MGA::DrakISO::ISOBuild; use MGA::DrakISO::Loopback; @@ -46,7 +45,7 @@ our @EXPORT = qw(build_iso); sub build_iso { my ($build) = @_; - my $efi_type = $build->{media}{efi_type} // 'none'; + my $efi_type = $build->{media}{efi_type} || 'none'; my $loopbacks = $build->get_build_dir('loopbacks'); my $files = $build->get_build_dir('files'); @@ -99,11 +98,9 @@ sub list_selected_loopbacks { sub build_iso_image { my ($build, @opts) = @_; - my $arch = $build->{settings}{arch}; + my $efi_type = $build->{media}{efi_type} || 'none'; - 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'; + 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'; |