From 828b81547e606dd7dfeb6516df75db903d559c60 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 23 Dec 2017 10:10:05 +0000 Subject: Merge drakclassic media and files steps. --- drakclassic | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'drakclassic') 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 -- cgit v1.2.1