summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-02-06 19:08:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-02-06 19:08:27 +0000
commitcbf3e348886d6be543225063c1846601bd1339de (patch)
tree0a01b9f44f0f32cc70fb1b4088dfc814936980af
parent597782cc9b1ad55e0552290539c07d1f91f28fd7 (diff)
downloaddrakx-backup-do-not-use-cbf3e348886d6be543225063c1846601bd1339de.tar
drakx-backup-do-not-use-cbf3e348886d6be543225063c1846601bd1339de.tar.gz
drakx-backup-do-not-use-cbf3e348886d6be543225063c1846601bd1339de.tar.bz2
drakx-backup-do-not-use-cbf3e348886d6be543225063c1846601bd1339de.tar.xz
drakx-backup-do-not-use-cbf3e348886d6be543225063c1846601bd1339de.zip
special way to remove mem=<memsize>
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/bootloader.pm2
2 files changed, 2 insertions, 2 deletions
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;