summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-12 04:31:12 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-05-18 04:22:19 +0200
commit7f9e02c8f2e5030852b7a952c8e6ad95a4cea50e (patch)
tree73580354139e4f008a93b3f85ebcdece59bd9a04
parent51903043dcd6867d224066ff80d458b74153cd0b (diff)
downloaddraklive-install-7f9e02c8f2e5030852b7a952c8e6ad95a4cea50e.tar
draklive-install-7f9e02c8f2e5030852b7a952c8e6ad95a4cea50e.tar.gz
draklive-install-7f9e02c8f2e5030852b7a952c8e6ad95a4cea50e.tar.bz2
draklive-install-7f9e02c8f2e5030852b7a952c8e6ad95a4cea50e.tar.xz
draklive-install-7f9e02c8f2e5030852b7a952c8e6ad95a4cea50e.zip
better reporting of insufficient space (mga#15257)
When the live installer checks if there is sufficient space on the chosen root partition it subtracts 10% (or 65MB) from the available space to give some headroom. It's better to add the headroom to the required space, as this gives a more accurate message when there is insufficient space.
-rw-r--r--NEWS2
-rwxr-xr-xdraklive-install5
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 4fd00bf..25e9b97 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- better reporting of insufficient space (mga#15257)
+
2.4
- fix loosing i18n settings on !live install (mga#15273)
diff --git a/draklive-install b/draklive-install
index e54245e..eacbc1d 100755
--- a/draklive-install
+++ b/draklive-install
@@ -176,8 +176,9 @@ sub ask_partitions {
fs::any::check_hds_boot_and_root($all_hds, $fstab);
fs::partitioning::choose_partitions_to_format($in, $fstab);
- my $total = get_total_size($in, $copy_source);
- my $available = fs::any::getAvailableSpace($fstab, 'skip_mounted');
+ my $total = get_total_size($in, $copy_source)
+ my $available = fs::any::getAvailableSpace($fstab, 'skip_mounted', 1);
+ $total += fs::any::getNeededMinSpace($available);
die N("Not enough space available (%s available while %s are needed)",
formatXiB($available), formatXiB($total)) . "\n"
if $total > $available;