diff options
author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-04 15:46:13 +0000 |
---|---|---|
committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-01-04 15:46:13 +0000 |
commit | 16661d2a7ced798f3dec7a52759ab6840911cba4 (patch) | |
tree | 5ec10c50dec57711e5773d493dfd0c04ace0833a /lib/MGA/DrakISO/Config.pm | |
parent | 04e2b14c395ede7933addb7c4c68e1eca35468c8 (diff) | |
download | drakiso-16661d2a7ced798f3dec7a52759ab6840911cba4.tar drakiso-16661d2a7ced798f3dec7a52759ab6840911cba4.tar.gz drakiso-16661d2a7ced798f3dec7a52759ab6840911cba4.tar.bz2 drakiso-16661d2a7ced798f3dec7a52759ab6840911cba4.tar.xz drakiso-16661d2a7ced798f3dec7a52759ab6840911cba4.zip |
Further simplification.
Remove some features inherited from draklive we no longer need.
Diffstat (limited to 'lib/MGA/DrakISO/Config.pm')
-rw-r--r-- | lib/MGA/DrakISO/Config.pm | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/MGA/DrakISO/Config.pm b/lib/MGA/DrakISO/Config.pm index c987bdf..d88df90 100644 --- a/lib/MGA/DrakISO/Config.pm +++ b/lib/MGA/DrakISO/Config.pm @@ -30,11 +30,8 @@ use MDK::Common; use Pod::Usage; use Cwd 'getcwd'; -#- we bless Media objects here -use MGA::DrakISO::Media; #- these modules can be used from config files use MGA::DrakISO::Mounts; -use MGA::DrakISO::CustomMedia; sub read_config { my ($build, $config_root, $config_path, $settings_path) = @_; @@ -63,7 +60,7 @@ sub check_config { #- check for minimum requirements $build->{settings}{arch} or die "ERROR: you must specify an architecture\n"; - ref $build->{media} && $build->{media}{storage} + $build->{media}{storage} or die "ERROR: you must specify the media storage type.\n"; $build->{media}{label} or die "ERROR: you must supply a media label\n"; @@ -76,12 +73,6 @@ sub complete_config { $build->{settings}{arch} ||= chomp_(`rpm --eval '%{_target_cpu}'`); - $_ = MGA::DrakISO::Media::new($_) foreach ( - $build->{media}, - ($build->{replicator} ? $build->{replicator}{media} : ()), - ($build->{oem_rescue} ? $build->{oem_rescue}{media} : ()), - ); - mkdir_p($build->get_builddir); mkdir_p($build->get_system_root); $build->{mnt} ||= $build->get_builddir('/mnt'); |