diff options
Diffstat (limited to 'draklive')
| -rwxr-xr-x | draklive | 38 |
1 files changed, 19 insertions, 19 deletions
@@ -43,22 +43,22 @@ use MGA::DrakISO::BuildISO; ############################################################################### sub clean { - my ($live) = @_; + my ($build) = @_; # make sure no external filesystems are mounted before cleaning - umount_external_fs($live); - rm_rf($_) foreach grep { -e $_ } $live->get_builddir, $live->get_system_root; + umount_external_fs($build); + rm_rf($_) foreach grep { -e $_ } $build->get_builddir, $build->get_system_root; } sub prepare_root { - my ($live) = @_; - MGA::DrakISO::BuildRoot::install_live_system($live); - MGA::DrakISO::BuildRoot::customise_live_system($live); + my ($build) = @_; + MGA::DrakISO::BuildRoot::install_live_system($build); + MGA::DrakISO::BuildRoot::customise_live_system($build); } sub prepare_boot { - my ($live) = @_; - MGA::DrakISO::BuildBoot::prepare_live_system_boot($live); - MGA::DrakISO::BuildBoot::prepare_iso_bootloader($live); + my ($build) = @_; + MGA::DrakISO::BuildBoot::prepare_live_system_boot($build); + MGA::DrakISO::BuildBoot::prepare_iso_bootloader($build); } ############################################################################### @@ -81,7 +81,7 @@ my @all = qw(root boot loop master); die "you must be root to run this program\n" if $>; -my $live_object = 'MGA::DrakISO::LiveBuild'->new; +my $build_object = 'MGA::DrakISO::LiveBuild'->new; my $config_root = $MGA::DrakISO::Config::default_config_root; my $config_path = $MGA::DrakISO::Config::default_config_path; my $settings_path = $MGA::DrakISO::Config::default_settings_path; @@ -90,26 +90,26 @@ GetOptions( "help" => sub { Pod::Usage::pod2usage('-verbose' => 1) }, "all" => sub { $_->{to_run} = 1 foreach grep { member($_->{name}, @all) } @actions }, (map { $_->{name} => \$_->{to_run} } @actions), - "all-regions" => sub { $live_object->{all_regions} = 1 }, + "all-regions" => sub { $build_object->{all_regions} = 1 }, "config-root=s" => \$config_root, "config=s" => \$config_path, "settings=s" => \$settings_path, - "define=s" => \%{$live_object->{settings}}, + "define=s" => \%{$build_object->{settings}}, ) or Pod::Usage::pod2usage(); require standalone; every { !$_->{to_run} } @actions and Pod::Usage::pod2usage(); - MGA::DrakISO::Config::read_config($live_object, $config_root, $config_path, $settings_path); - MGA::DrakISO::Config::check_config($live_object); - MGA::DrakISO::Config::complete_config($live_object); + MGA::DrakISO::Config::read_config($build_object, $config_root, $config_path, $settings_path); + MGA::DrakISO::Config::check_config($build_object); + MGA::DrakISO::Config::complete_config($build_object); - foreach my $region ($live_object->{all_regions} ? sort(keys %{$live_object->{regions}}) : $live_object->{settings}{region}) { + foreach my $region ($build_object->{all_regions} ? sort(keys %{$build_object->{regions}}) : $build_object->{settings}{region}) { $region and print qq(=== proceeding with region "$region"\n); - $live_object->{settings}{region} = $region; + $build_object->{settings}{region} = $region; foreach (grep { $_->{to_run} } @actions) { print qq(* entering step "$_->{name}"\n); - $_->{do}->($live_object); + $_->{do}->($build_object); print qq(* step "$_->{name}" done\n); } } @@ -184,7 +184,7 @@ See the "drakiso-live" page on the Mageia Wiki for details. =item B<--settings> Makes draklive load the next argument as a file in key=value format into -the $live->{settings} hash ($live being the global live configuration hash). +the $build->{settings} hash ($build being the global configuration hash). Built-in keys: |