From 35e05a25b4c6bb5b737f0672820ed99e8c380615 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Thu, 30 Oct 2008 16:50:18 +0000 Subject: lower estimated disk size in heuristics --- draklive | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'draklive') diff --git a/draklive b/draklive index 10fe51e..51a25e4 100755 --- a/draklive +++ b/draklive @@ -637,13 +637,14 @@ EOF sub create_disk_master { my ($live, $opts) = @_; my $dest = get_disk_master_path($live); - #- dumb guess, a bit too large, and valid for FAT only - my $part_size = @{$live->{mount}{dirs} || []} ? + my $disk_size = @{$live->{mount}{dirs} || []} ? + #- dumb guess, a bit too large, and valid for FAT only (directory_usage($live->get_builddir . $live->{prefix}{build}{loopbacks}) + - directory_usage($live->get_builddir . $live->{prefix}{build}{boot})) : - directory_usage($live->get_system_root); + directory_usage($live->get_builddir . $live->{prefix}{build}{boot}) + + 100000000) : + (directory_usage($live->get_system_root) + 200000000); - my $loop = allocate_master($dest, 500000000 + $part_size, $live->{media}->get_media_setting('fs')); + my $loop = allocate_master($dest, $disk_size, $live->{media}->get_media_setting('fs')); local $opts->{device} = $loop; local $opts->{disk_device} = $dest; record_master($live, $opts); -- cgit v1.2.1