summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-10-27 09:25:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-10-27 09:25:37 +0000
commit544a1b148cac7d4e3ad3ea8b4095ca3546230296 (patch)
tree3884ab1ef76adf2de05fece719b78c38bc67b220 /perl-install/any.pm
parent9d4845f779a1486cf265064b1c8e3c0c5177c197 (diff)
downloaddrakx-544a1b148cac7d4e3ad3ea8b4095ca3546230296.tar
drakx-544a1b148cac7d4e3ad3ea8b4095ca3546230296.tar.gz
drakx-544a1b148cac7d4e3ad3ea8b4095ca3546230296.tar.bz2
drakx-544a1b148cac7d4e3ad3ea8b4095ca3546230296.tar.xz
drakx-544a1b148cac7d4e3ad3ea8b4095ca3546230296.zip
- handle setting memsize mem= kernel parameter in a special function
- rely on pack_append() to remove dups (using $uniq_dict_appends) in set_append_with_key() (drawback: it doesn't keep the order anymore)
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 817ffab51..bf0678fc7 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -231,7 +231,7 @@ sub setupBootloader__general {
my $prev_force_acpi = my $force_acpi = bootloader::get_append_with_key($b, 'acpi') !~ /off|ht/;
my $prev_force_noapic = my $force_noapic = bootloader::get_append_simple($b, 'noapic');
my $prev_force_nolapic = my $force_nolapic = bootloader::get_append_simple($b, 'nolapic');
- my $memsize = bootloader::get_append_with_key($b, 'mem');
+ my $memsize = bootloader::get_append_memsize($b);
my $prev_clean_tmp = my $clean_tmp = any { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special} ||= []};
my $prev_boot = $b->{boot};
@@ -297,7 +297,7 @@ sub setupBootloader__general {
$in->do_pkgs->ensure_binary_is_installed('grub', "grub", 1) or return 0;
}
- bootloader::set_append_with_key($b, mem => $memsize || 0);
+ bootloader::set_append_memsize($b, $memsize);
if ($prev_force_acpi != $force_acpi) {
bootloader::set_append_with_key($b, acpi => ($force_acpi ? '' : 'ht'));
}