summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-20 15:11:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-20 15:11:47 +0000
commitac8a9fbea5d45369f3a48fe518fd932682e44d7a (patch)
treec0e7f97d5efb6121f87f00ce5926c637e697a19e /perl-install/install_steps.pm
parentf49ea815cc1c84571ebc34214aeff5ff668f62b9 (diff)
downloaddrakx-ac8a9fbea5d45369f3a48fe518fd932682e44d7a.tar
drakx-ac8a9fbea5d45369f3a48fe518fd932682e44d7a.tar.gz
drakx-ac8a9fbea5d45369f3a48fe518fd932682e44d7a.tar.bz2
drakx-ac8a9fbea5d45369f3a48fe518fd932682e44d7a.tar.xz
drakx-ac8a9fbea5d45369f3a48fe518fd932682e44d7a.zip
- add "Force No APIC"
- rename add_append() to set_append() (since it can be used to remove a key) - add remove_append_simple()
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm15
1 files changed, 9 insertions, 6 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 7bb4a8101..d4c2826e6 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -823,19 +823,22 @@ sub setupBootloaderBefore {
require bootloader;
if (my @l = (grep { $_->{bus} eq 'ide' } detect_devices::burners(), detect_devices::raw_zips())) {
- bootloader::add_append($o->{bootloader}, $_->{device}, 'ide-scsi') foreach @l;
+ bootloader::set_append($o->{bootloader}, $_->{device}, 'ide-scsi') foreach @l;
}
if ($o->{miscellaneous}{HDPARM}) {
- bootloader::add_append($o->{bootloader}, $_, 'autotune') foreach grep { /ide.*/ } all("/proc/ide");
+ bootloader::set_append($o->{bootloader}, $_, 'autotune') foreach grep { /ide.*/ } all("/proc/ide");
}
if (cat_("/proc/cmdline") =~ /mem=nopentium/) {
- bootloader::add_append($o->{bootloader}, 'mem', 'nopentium');
+ bootloader::set_append($o->{bootloader}, 'mem', 'nopentium');
}
if (cat_("/proc/cmdline") =~ /\b(pci)=(\S+)/) {
- bootloader::add_append($o->{bootloader}, $1, $2);
+ bootloader::set_append($o->{bootloader}, $1, $2);
}
- if (my ($acpi) = cat_("/proc/cmdline") =~ /\bacpi=(\S+)/) {
- bootloader::add_append($o->{bootloader}, acpi => $acpi);
+ if (cat_("/proc/cmdline") =~ /\bacpi=off/) {
+ bootloader::set_append($o->{bootloader}, acpi => 'off');
+ }
+ if (cat_("/proc/cmdline") =~ /\bnoapic/) {
+ bootloader::set_append($o->{bootloader}, 'noapic');
}
if (arch() =~ /alpha/) {