Merge drakclassic media and files steps.

2 files changed, 4 insertions, 10 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
 
diff --git a/lib/MGA/DrakISO/BuildClassic.pm b/lib/MGA/DrakISO/BuildMedia.pm
index b276a71..531c684 100644
--- a/lib/MGA/DrakISO/BuildClassic.pm
+++ b/lib/MGA/DrakISO/BuildMedia.pm
@@ -21,7 +21,7 @@
 # be used by the classic installer and to collect together the various other
 # files that are needed on the installer ISO.
 
-package MGA::DrakISO::BuildClassic;
+package MGA::DrakISO::BuildMedia;
 
 use strict;
 
@@ -90,10 +90,6 @@ sub prepare_media {
     handle_conflicts($build);
 
     build_installer_media($build);
-}
-
-sub prepare_files {
-    my ($build) = @_;
 
     my $arch    = $build->{settings}{arch};
     my $version = $build->{settings}{version};