summaryrefslogtreecommitdiffstats
path: root/lib/MGA/DrakISO/BuildISO.pm
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-04-08 08:53:35 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-04-15 22:06:36 +0100
commit7c0cab87133acd7df0084f495b3d4f52fbf2dc9b (patch)
tree3d09465e7fdb83c2e322c3f11d6cf202ca5f09b5 /lib/MGA/DrakISO/BuildISO.pm
parenta6451ba864ca95299cbfded9d7b04d9001961ebb (diff)
downloaddrakiso-7c0cab87133acd7df0084f495b3d4f52fbf2dc9b.tar
drakiso-7c0cab87133acd7df0084f495b3d4f52fbf2dc9b.tar.gz
drakiso-7c0cab87133acd7df0084f495b3d4f52fbf2dc9b.tar.bz2
drakiso-7c0cab87133acd7df0084f495b3d4f52fbf2dc9b.tar.xz
drakiso-7c0cab87133acd7df0084f495b3d4f52fbf2dc9b.zip
Remove obsolute support for different mount and loopback options.
The dracut-generated initrd doesn't support them.
Diffstat (limited to 'lib/MGA/DrakISO/BuildISO.pm')
-rw-r--r--lib/MGA/DrakISO/BuildISO.pm15
1 files changed, 1 insertions, 14 deletions
diff --git a/lib/MGA/DrakISO/BuildISO.pm b/lib/MGA/DrakISO/BuildISO.pm
index 09096a7..5ba55d0 100644
--- a/lib/MGA/DrakISO/BuildISO.pm
+++ b/lib/MGA/DrakISO/BuildISO.pm
@@ -28,11 +28,8 @@ use strict;
use MDK::Common;
use MGA::DrakISO::ISOBuild;
-use MGA::DrakISO::Loopback;
use MGA::DrakISO::Utils;
-use MGA::DrakISO::BuildLoop;
-
use Exporter;
our @ISA = qw(Exporter);
our @EXPORT = qw(build_iso);
@@ -57,9 +54,7 @@ sub build_iso {
'/EFI=' . $build->get_build_dir('EFI'),
),
if_(-d $loopbacks,
- map {
- '/loopbacks' . $_ . '=' . $loopbacks . $_;
- } list_selected_loopbacks($build)
+ '/loopbacks=' . $loopbacks
),
if_(-d $files,
map {
@@ -69,14 +64,6 @@ sub build_iso {
);
}
-sub list_selected_loopbacks {
- my ($build) = @_;
- my @pack = $build->{settings}{pack} ? @{$build->{packs}{$build->{settings}{pack}} || []} : ();
- my @pack_modules = grep { member($_->{name}, @pack) } list_loopback_modules($build);
- (map { $loop_types{$_->{type}}{is_loopback} && $_->{path} ? $_->{path} . $loop_types{$_->{type}}{extension} : () } @{$build->{mount}{dirs} || []}),
- (map { '/modules/' . $_->{name} . $loop_types{$_->{type}}{extension} } @pack_modules);
-}
-
# This function builds a hybrid ISO capable of both legacy and UEFI boot. The
# ISO contains a primary iso9660 partition (which is the only thing visible
# when booting from DVD) and a secondary ESP partition (which is only used