summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-06-29 13:46:20 +0000
committerOlivier Blin <oblin@mandriva.com>2009-06-29 13:46:20 +0000
commit6f3f46e79198fd234cbb17101f9e9dd8639eb01b (patch)
tree3c0493bac052b9e47ce8310f5235ea8cc9087da3
parent3b1aa9e65ae46267fe056db7725662336e976edd (diff)
downloaddrakiso-6f3f46e79198fd234cbb17101f9e9dd8639eb01b.tar
drakiso-6f3f46e79198fd234cbb17101f9e9dd8639eb01b.tar.gz
drakiso-6f3f46e79198fd234cbb17101f9e9dd8639eb01b.tar.bz2
drakiso-6f3f46e79198fd234cbb17101f9e9dd8639eb01b.tar.xz
drakiso-6f3f46e79198fd234cbb17101f9e9dd8639eb01b.zip
pass live to allocate_master (for $live->{oem_rescue})
-rwxr-xr-xdraklive6
1 files changed, 3 insertions, 3 deletions
diff --git a/draklive b/draklive
index 22b38d5..9ed60dd 100755
--- a/draklive
+++ b/draklive
@@ -678,7 +678,7 @@ sub allocate_partition {
}
sub allocate_master {
- my ($media, $dest, $size, $fs) = @_;
+ my ($live, $media, $dest, $size, $fs) = @_;
mkdir_p(dirname($dest));
my $heads = 16;
my $sectors_per_track = 63;
@@ -763,7 +763,7 @@ sub create_disk_master {
70000000) :
directory_usage($live->get_system_root) + 200000000 + 4500000000; #- FIXME: use size from $live->{media}{partitions}
- my @loops = allocate_master($live->{media}, $dest, $disk_size, $live->{media}->get_media_setting('fs'));
+ my @loops = allocate_master($live, $live->{media}, $dest, $disk_size, $live->{media}->get_media_setting('fs'));
my $slash_idx = $live->{media}->find_partition_index('/');
local $opts->{device} = $loops[$slash_idx];
local $opts->{disk_device} = $dest;
@@ -1153,7 +1153,7 @@ sub create_usb_replicator {
my $dest = get_disk_replicator_path($live);
my %files = get_disk_replicator_files($live);
my $size = fold_left { $::a + $::b } map { directory_usage($_, 'apparent') } keys(%files);
- my @loops = allocate_master($live->{replicator}{media}, $dest, 5000000 + $size, 'vfat');
+ my @loops = allocate_master($live, $live->{replicator}{media}, $dest, 5000000 + $size, 'vfat');
my $slash_idx = $live->{replicator}{media}->find_partition_index('/');
my $opts = { device => $loops[$slash_idx], disk_device => $dest, append => $live->{replicator}{append} };
record_usb_replicator($live, $opts);