Attachment 6518 Details for Bug 15257 – Patch #2 - apply to draklive-install

[patch] Patch #2 - apply to draklive-install

0002-Fix-for-mga-15257-reporting-of-insufficient-space-in.patch (text/plain), 1.51 KB, created by Martin Whitaker on 2015-05-12 02:06:06 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2015-05-12 02:06:06 CEST

Size: 1.51 KB

patch

obsolete

>From 81de6b9fc1afdf91fe95480c5ee24ce20cd99cb5 Mon Sep 17 00:00:00 2001
>From: Martin Whitaker <mailing-list@martin-whitaker.me.uk>
>Date: Tue, 12 May 2015 00:43:56 +0100
>Subject: [PATCH] Fix for mga#15257 - reporting of insufficient space in live
> installer.
>
>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.
>
>This patch must be applied in combination with the patch to drakx.
>
>diff --git a/draklive-install b/draklive-install
>index e54245e..160536d 100755
>--- a/draklive-install
>+++ b/draklive-install
>@@ -178,6 +178,13 @@ sub ask_partitions {
> 
>     my $total = get_total_size($in, $copy_source);
>     my $available = fs::any::getAvailableSpace($fstab, 'skip_mounted');
>+    #- make sure of this space to be available for installation, this could help a lot.
>+    #- currently doing a very small install uses 36Mb of postinstall-rpm, but installing
>+    #- these packages may eat up to 90Mb (of course not all the server may be installed!).
>+    #- 65mb may be a good choice to avoid almost all problems of insufficient space left...
>+    my $minExtraSize = 65 * sqr(1024);
>+    $total += max(0.1 * $available, $minExtraSize);
>+
>     die N("Not enough space available (%s available while %s are needed)",
>           formatXiB($available), formatXiB($total)) . "\n"
>       if $total > $available;
>-- 
>2.3.2
>

From 81de6b9fc1afdf91fe95480c5ee24ce20cd99cb5 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mailing-list@martin-whitaker.me.uk>
Date: Tue, 12 May 2015 00:43:56 +0100
Subject: [PATCH] Fix for mga#15257 - reporting of insufficient space in live
 installer.

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.

This patch must be applied in combination with the patch to drakx.

diff --git a/draklive-install b/draklive-install
index e54245e..160536d 100755
--- a/draklive-install
+++ b/draklive-install
@@ -178,6 +178,13 @@ sub ask_partitions {
 
     my $total = get_total_size($in, $copy_source);
     my $available = fs::any::getAvailableSpace($fstab, 'skip_mounted');
+    #- make sure of this space to be available for installation, this could help a lot.
+    #- currently doing a very small install uses 36Mb of postinstall-rpm, but installing
+    #- these packages may eat up to 90Mb (of course not all the server may be installed!).
+    #- 65mb may be a good choice to avoid almost all problems of insufficient space left...
+    my $minExtraSize = 65 * sqr(1024);
+    $total += max(0.1 * $available, $minExtraSize);
+
     die N("Not enough space available (%s available while %s are needed)",
           formatXiB($available), formatXiB($total)) . "\n"
       if $total > $available;
-- 
2.3.2

Actions: View | Diff

Attachments on bug 15257: 6245 | 6517 | 6518 | 6519 | 6520 | 6521