summaryrefslogtreecommitdiffstats
path: root/drakclassic
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-12-23 10:10:05 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-12-23 10:10:05 +0000
commit828b81547e606dd7dfeb6516df75db903d559c60 (patch)
treeeec7f1fad0bb5a8619558309af580ec9a2099d4a /drakclassic
parent56a5f9567ef4f7c26688893363eac7270c0ecb98 (diff)
downloaddrakiso-828b81547e606dd7dfeb6516df75db903d559c60.tar
drakiso-828b81547e606dd7dfeb6516df75db903d559c60.tar.gz
drakiso-828b81547e606dd7dfeb6516df75db903d559c60.tar.bz2
drakiso-828b81547e606dd7dfeb6516df75db903d559c60.tar.xz
drakiso-828b81547e606dd7dfeb6516df75db903d559c60.zip
Merge drakclassic media and files steps.
Diffstat (limited to 'drakclassic')
-rwxr-xr-xdrakclassic8
1 files changed, 3 insertions, 5 deletions
diff --git a/drakclassic b/drakclassic
index e8a5a4e..a4a88c8 100755
--- a/drakclassic
+++ b/drakclassic
@@ -33,7 +33,7 @@ use MGA::DrakISO::Config;
use MGA::DrakISO::ClassicBuild;
use MGA::DrakISO::Utils;
-use MGA::DrakISO::BuildClassic;
+use MGA::DrakISO::BuildMedia;
use MGA::DrakISO::BuildBoot;
use MGA::DrakISO::BuildISO;
@@ -67,12 +67,11 @@ sub clean {
my @actions = (
{ name => 'dump-config', do => \&MGA::DrakISO::Config::dump_config },
{ name => 'clean', do => \&clean },
- { name => 'media', do => \&MGA::DrakISO::BuildClassic::prepare_media },
- { name => 'files', do => \&MGA::DrakISO::BuildClassic::prepare_files },
+ { name => 'media', do => \&MGA::DrakISO::BuildMedia::prepare_media },
{ name => 'boot', do => \&MGA::DrakISO::BuildBoot::prepare_iso_bootloader },
{ name => 'master', do => \&MGA::DrakISO::BuildISO::build_iso },
);
-my @all = qw(media files boot master);
+my @all = qw(media boot master);
my $build_object = 'MGA::DrakISO::ClassicBuild'->new;
my $config_root = '/etc/drakclassic';
@@ -126,7 +125,6 @@ drakclassic [options]
--help long help message
--media prepare the installation media to be included on the ISO
- --files prepare the other files to be included on the ISO
--boot prepare installer boot and ISO bootloader files
--master build master image