diff options
author | Olivier Blin <oblin@mandriva.com> | 2008-10-30 16:50:18 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2008-10-30 16:50:18 +0000 |
commit | 35e05a25b4c6bb5b737f0672820ed99e8c380615 (patch) | |
tree | b456999c049d17f3fd6f631f9c2d8cb77f44517a | |
parent | d3f1efc3f8c4f979437d23d3e8a9a03311974cf7 (diff) | |
download | draklive-35e05a25b4c6bb5b737f0672820ed99e8c380615.tar draklive-35e05a25b4c6bb5b737f0672820ed99e8c380615.tar.gz draklive-35e05a25b4c6bb5b737f0672820ed99e8c380615.tar.bz2 draklive-35e05a25b4c6bb5b737f0672820ed99e8c380615.tar.xz draklive-35e05a25b4c6bb5b737f0672820ed99e8c380615.zip |
lower estimated disk size in heuristics
-rwxr-xr-x | draklive | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -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); |