- add "Force No APIC"

- rename add_append() to set_append()
  (since it can be used to remove a key)
- add remove_append_simple()

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/) {