summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.perl_checker1
-rwxr-xr-xdraklive4
2 files changed, 2 insertions, 3 deletions
diff --git a/.perl_checker b/.perl_checker
index d9de1fd..473c84d 100644
--- a/.perl_checker
+++ b/.perl_checker
@@ -1,2 +1 @@
-urpm::media
urpm::parallel
diff --git a/draklive b/draklive
index 578f628..4c7b927 100755
--- a/draklive
+++ b/draklive
@@ -1314,7 +1314,7 @@ sub create_vm_image {
}
sub get_rescue_files {
- my ($live, $rescue_opts, $extra_files) = @_;
+ my ($live, $rescue_opts, $o_extra_files) = @_;
my $media_boot = $live->get_media_prefix('boot');
my $initrd = $media_boot . $rescue_opts->{media}->get_initrd_path;
my @stage2_files = $live->{settings}{replicator_type} eq 'drakx' ? (
@@ -1325,7 +1325,7 @@ sub get_rescue_files {
'/usr/lib/drakx-installer-images/isolinux/alt0/vmlinuz' => $media_boot . '/vmlinuz',
'/usr/lib/drakx-installer-images/isolinux/alt0/all.rdz' => $initrd,
(map { $_ => '/install/stage2/' } @stage2_files),
- @{$extra_files || []},
+ @{$o_extra_files || []},
#- FIXME: factorize with copy_files_to to handle glob
(map { $live->{settings}{config_root} . '/' . $_->[0] => '/' . $_->[1] } @{$rescue_opts->{files} || []}),
);