summaryrefslogtreecommitdiffstats
path: root/drakclassic
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-12-22 00:29:27 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-12-22 00:29:27 +0000
commit4b4b3e37c0025a512df5967ae9e46353caadf6bc (patch)
tree68c543a60986f3bada47c909b0be609801d8059a /drakclassic
parentfcdc9d5967cbf861db391a777bb129afc2e2560b (diff)
downloaddrakiso-4b4b3e37c0025a512df5967ae9e46353caadf6bc.tar
drakiso-4b4b3e37c0025a512df5967ae9e46353caadf6bc.tar.gz
drakiso-4b4b3e37c0025a512df5967ae9e46353caadf6bc.tar.bz2
drakiso-4b4b3e37c0025a512df5967ae9e46353caadf6bc.tar.xz
drakiso-4b4b3e37c0025a512df5967ae9e46353caadf6bc.zip
Complete support for building classic installer ISOs.
Diffstat (limited to 'drakclassic')
-rwxr-xr-xdrakclassic27
1 files changed, 11 insertions, 16 deletions
diff --git a/drakclassic b/drakclassic
index b1c4c61..b0d7ff2 100755
--- a/drakclassic
+++ b/drakclassic
@@ -33,7 +33,7 @@ use MGA::DrakISO::Config;
use MGA::DrakISO::ClassicBuild;
use MGA::DrakISO::Utils;
-use MGA::DrakISO::BuildMedia;
+use MGA::DrakISO::BuildClassic;
use MGA::DrakISO::BuildBoot;
use MGA::DrakISO::BuildISO;
@@ -46,12 +46,6 @@ sub clean {
rm_rf($_) foreach grep { -e $_ } $build->get_builddir, $build->get_system_root;
}
-sub prepare_boot {
- my ($build) = @_;
- MGA::DrakISO::BuildBoot::prepare_classic_boot($build);
- MGA::DrakISO::BuildBoot::prepare_iso_bootloader($build);
-}
-
###############################################################################
# Main Program
###############################################################################
@@ -59,13 +53,12 @@ sub prepare_boot {
my @actions = (
{ name => 'dump-config', do => \&MGA::DrakISO::Config::dump_config },
{ name => 'clean', do => \&clean },
- { name => 'media', do => \&MGA::DrakISO::BuildMedia::prepare_media },
- { name => 'boot', do => \&prepare_boot },
- { name => 'boot-classic', do => \&MGA::DrakISO::BuildBoot::prepare_classic_boot },
- { name => 'boot-loader', do => \&MGA::DrakISO::BuildBoot::prepare_iso_bootloader },
- { name => 'master', do => \&MGA::DrakISO::BuildISO::build_classic_iso },
+ { name => 'media', do => \&MGA::DrakISO::BuildClassic::prepare_media },
+ { name => 'files', do => \&MGA::DrakISO::BuildClassic::prepare_files },
+ { name => 'boot', do => \&MGA::DrakISO::BuildBoot::prepare_iso_bootloader },
+ { name => 'master', do => \&MGA::DrakISO::BuildISO::build_iso },
);
-my @all = qw(media boot master);
+my @all = qw(media files boot master);
die "you must be root to run this program\n" if $>;
@@ -91,6 +84,10 @@ require standalone;
MGA::DrakISO::Config::check_config($build_object);
MGA::DrakISO::Config::complete_config($build_object);
+ if ($build_object->{settings}{repository} =~ /^http:|^ftp:/) {
+ die "Sorry - remote repositories are not supported yet.";
+ }
+
foreach (grep { $_->{to_run} } @actions) {
print qq(* entering step "$_->{name}"\n);
$_->{do}->($build_object);
@@ -115,6 +112,7 @@ 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
@@ -122,9 +120,6 @@ drakclassic [options]
--clean clean installation chroot and work directory
- --boot-system (for debug) prepare kernel and initrd for installer boot
- --boot-loader (for debug) prepare bootloader for ISO
-
--config-root <dir>
root directory containing config and additional files
defaults to current directory if it contains a