Attachment 6517 Details for Bug 15257 – Patch #1 - apply to drakx

Patch #1 - apply to drakx

0001-Fix-for-mga-15257-reporting-of-insufficient-space-in.patch (text/plain), 1.50 KB, created by Martin Whitaker on 2015-05-12 01:57:15 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2015-05-12 01:57:15 CEST

Size: 1.50 KB

patch

obsolete

>From b6f78240846c98b8bd42ff487ae451d96c358e7f Mon Sep 17 00:00:00 2001
>From: Martin Whitaker <mageia@martin-whitaker.me.uk>
>Date: Tue, 12 May 2015 00:11:40 +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
>draklive-install.
>
>diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
>index 3021cd5..af11ac4 100644
>--- a/perl-install/fs/any.pm
>+++ b/perl-install/fs/any.pm
>@@ -96,15 +96,9 @@ sub prepare_minimal_root() {
> sub getAvailableSpace {
>     my ($fstab, $o_skip_mounted) = @_;
> 
>-    #- make sure of this place to be available for installation, this could help a lot.
>-    #- currently doing a very small install use 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 problem of insuficient space left...
>-    my $minAvailableSize = 65 * sqr(1024);
>-
>     my $n = !$::testing && !$o_skip_mounted && getAvailableSpace_mounted($::prefix) || 
>             getAvailableSpace_raw($fstab) * 512 / 1.07;
>-    $n - max(0.1 * $n, $minAvailableSize);
>+    $n;
> }
> 
> sub getAvailableSpace_mounted {
>-- 
>2.3.2

From b6f78240846c98b8bd42ff487ae451d96c358e7f Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 12 May 2015 00:11:40 +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
draklive-install.

diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index 3021cd5..af11ac4 100644
--- a/perl-install/fs/any.pm
+++ b/perl-install/fs/any.pm
@@ -96,15 +96,9 @@ sub prepare_minimal_root() {
 sub getAvailableSpace {
     my ($fstab, $o_skip_mounted) = @_;
 
-    #- make sure of this place to be available for installation, this could help a lot.
-    #- currently doing a very small install use 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 problem of insuficient space left...
-    my $minAvailableSize = 65 * sqr(1024);
-
     my $n = !$::testing && !$o_skip_mounted && getAvailableSpace_mounted($::prefix) || 
             getAvailableSpace_raw($fstab) * 512 / 1.07;
-    $n - max(0.1 * $n, $minAvailableSize);
+    $n;
 }
 
 sub getAvailableSpace_mounted {
-- 
2.3.2

Actions: View

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