summaryrefslogtreecommitdiffstats
path: root/draklive
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-25 16:45:08 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-25 16:45:08 +0000
commit1461a368bc63f183ecfc6d068046d82deb99e8f8 (patch)
tree20ee50dc986c558a1146f1aea6af3bf817454f4e /draklive
parent971a147534d8cb55494ffc4b62513063e20d852e (diff)
downloaddrakiso-1461a368bc63f183ecfc6d068046d82deb99e8f8.tar
drakiso-1461a368bc63f183ecfc6d068046d82deb99e8f8.tar.gz
drakiso-1461a368bc63f183ecfc6d068046d82deb99e8f8.tar.bz2
drakiso-1461a368bc63f183ecfc6d068046d82deb99e8f8.tar.xz
drakiso-1461a368bc63f183ecfc6d068046d82deb99e8f8.zip
replicator function is specific to the replicator media
Diffstat (limited to 'draklive')
-rwxr-xr-xdraklive10
1 files changed, 5 insertions, 5 deletions
diff --git a/draklive b/draklive
index 01911eb..a90583a 100755
--- a/draklive
+++ b/draklive
@@ -153,13 +153,13 @@ my %storage = (
create => \&create_disk_master,
format => \&format_usb_device,
record => \&record_usb_master,
+ replicator => \&create_usb_replicator,
},
harddisk => {
fs => 'ext3',
create => \&create_disk_master,
record => \&record_harddisk_master,
image => \&create_disk_image,
- replicator => \&create_disk_replicator_usb,
},
);
@@ -1684,18 +1684,18 @@ sub get_disk_replicator_files {
);
}
-sub create_disk_replicator_usb {
+sub create_usb_replicator {
my ($live) = @_;
my $dest = get_disk_replicator_path($live);
my %files = get_disk_replicator_files($live);
my $size = fold_left { $::a + $::b } map { directory_usage($_) } keys(%files);
my $loop = allocate_master($dest, 3000000 + $size, 'vfat');
my $opts = { device => $loop, disk_device => $dest };
- record_disk_replicator_usb($live, $opts);
+ record_usb_replicator($live, $opts);
run_('losetup', '-d', $loop);
}
-sub record_disk_replicator_usb {
+sub record_usb_replicator {
my ($live, $opts) = @_;
my $media = $live->{replicator}{media};
my $media_boot = get_media_prefix($live, 'boot');
@@ -1729,7 +1729,7 @@ sub record_disk_replicator_usb {
sub create_replicator {
my ($live) = @_;
- if (my $create = get_media_setting($live->{media}, 'replicator')) {
+ if (my $create = get_media_setting($live->{replicator}{media}, 'replicator')) {
$create->($live);
} else {
warn "not implemented yet\n";