From 985a95ed0b0b3591d9d7c7aac69ec2a2ecae06ba Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Wed, 23 Jan 2002 18:40:13 +0000
Subject: fixed to allow multiple mem=xxx parameter (especially mem=nopentium).

---
 perl-install/bootloader.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 366223713..736ee60ec 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -189,7 +189,11 @@ sub add_append {
     my ($b, $key, $val) = @_;
 
     foreach (\$b->{perImageAppend}, map { \$_->{append} } @{$b->{entries}}) {
-	$$_ =~ s/\b$key=\S*\s*//;
+	if ($key eq 'mem') {
+	    $$_ =~ s/\bmem=(\d+[KkMm]?)(\s.*)?$/$2/;
+	} else {
+	    $$_ =~ s/\b$key=\S*\s*//;
+	}
 	$$_ =~ s/\s*$/ $key=$val/ if $val;
 	log::l("add_append: $$_");
     }
@@ -335,7 +339,7 @@ wait %d seconds for default boot.
 	}
     }
 
-    add2hash_($lilo, { memsize => $1 }) if cat_("/proc/cmdline") =~ /mem=(\S+)/;
+    add2hash_($lilo, { memsize => $1 }) if cat_("/proc/cmdline") =~ /\bmem=(\d+[KkMm]?)(?:\s.*)?$/;
     if (my ($s, $port, $speed) = cat_("/proc/cmdline") =~ /console=(ttyS(\d),(\d+)\S*)/) {
 	log::l("serial console $s $port $speed");
 	add_append($lilo, 'console' => $s);
-- 
cgit v1.2.1