summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-11-24 18:43:55 +0000
committerOlivier Blin <oblin@mandriva.com>2009-11-24 18:43:55 +0000
commit98d74daa2631ba94f0fd50b339410afb9485629f (patch)
treee14ad2d7bcf327cee72d47ab983b7c464c50b1e8
parent0e1961f0eb514e64d924897e7ebed7e1869ee8a7 (diff)
downloaddraklive-98d74daa2631ba94f0fd50b339410afb9485629f.tar
draklive-98d74daa2631ba94f0fd50b339410afb9485629f.tar.gz
draklive-98d74daa2631ba94f0fd50b339410afb9485629f.tar.bz2
draklive-98d74daa2631ba94f0fd50b339410afb9485629f.tar.xz
draklive-98d74daa2631ba94f0fd50b339410afb9485629f.zip
allow drakx-based replicator
(by setting live->{settings}{replicator_type} to "drakx")
-rwxr-xr-xdraklive6
1 files changed, 5 insertions, 1 deletions
diff --git a/draklive b/draklive
index 653387d..32e1544 100755
--- a/draklive
+++ b/draklive
@@ -1166,10 +1166,14 @@ sub get_rescue_files {
my ($live, $rescue_opts, $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' ? (
+ '/usr/lib/drakx-installer-stage2/install/stage2/mdkinst.sqfs',
+ $live->get_system_root . '/bin/dd',
+ ) : '/usr/lib/drakx-installer-rescue/rescue.sqfs';
(
'/usr/lib/drakx-installer-images/isolinux/alt0/vmlinuz' => $media_boot . '/vmlinuz',
'/usr/lib/drakx-installer-images/isolinux/alt0/all.rdz' => $initrd,
- '/usr/lib/drakx-installer-rescue/rescue.sqfs' => '/install/stage2/',
+ (map { $_ => '/install/stage2/' } @stage2_files),
@{$extra_files || []},
#- FIXME: factorize with copy_files_to to handle glob
(map { $live->{settings}{config_root} . '/' . $_->[0] => '/' . $_->[1] } @{$rescue_opts->{files} || []}),