From cbf3e348886d6be543225063c1846601bd1339de Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 6 Feb 2004 19:08:27 +0000
Subject: special way to remove mem=<memsize>

---
 perl-install/any.pm        | 2 +-
 perl-install/bootloader.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index e8927ec00..ab57b6ec0 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -258,7 +258,7 @@ sub setupBootloader__general {
     }
 
     bootloader::set_profiles($b, $profiles);
-    bootloader::set_append($b, "mem", $memsize);
+    bootloader::set_append($b, "mem", $memsize || 0);
     if ($prev_force_acpi != $force_acpi) {
 	bootloader::set_append($b, acpi => ($force_acpi ? '' : 'ht'));
     }
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 4a83f3c3a..d4e5297d1 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -381,7 +381,7 @@ sub set_append {
 	my ($simple, $dict) = @_;
 	if ($has_val) {
 	    @$dict = grep { $_->[0] ne $key || $key eq 'mem' && append__mem_is_memsize($_->[1]) != append__mem_is_memsize($val) } @$dict;
-	    push @$dict, [ $key, $val ] if $val ne '';
+	    push @$dict, [ $key, $val ] if !($val eq '' || $key eq 'mem' && !$val);
 	} else {
 	    @$simple = grep { $_ ne $key } @$simple;
 	    push @$simple, $key;
-- 
cgit v1.2.1