From d6867c1d7c99edd043c64e3c6667796c28be408a Mon Sep 17 00:00:00 2001
From: Nicolas Planel <nplanel@mandriva.com>
Date: Wed, 27 Aug 2003 15:43:57 +0000
Subject: Now acpi=ht to prevent HT detection only

---
 perl-install/install_steps.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index f0f9b452f..905eaa1b2 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -729,7 +729,7 @@ sub summaryAfter {
     my ($o) = @_;
 
     require bootloader;
-    bootloader::get_append($o->{bootloader}, 'acpi') ne 'off' && !(-x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid")
+    bootloader::get_append($o->{bootloader}, 'acpi') ne 'off' && ne 'ht' && !(-x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid")
 	and $o->do_pkgs->install(qw(acpi acpid));
 }
 
@@ -885,6 +885,9 @@ sub setupBootloaderBefore {
     if (cat_("/proc/cmdline") =~ /\bacpi=off/) {
 	bootloader::set_append($o->{bootloader}, acpi => 'off');
     }
+    if (cat_("/proc/cmdline") =~ /\bacpi=ht/) {
+	bootloader::set_append($o->{bootloader}, acpi => 'ht');
+    }
     if (cat_("/proc/cmdline") =~ /\bnoapic/) {
 	bootloader::set_append($o->{bootloader}, 'noapic');
     }
-- 
cgit v1.2.1