summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorNicolas Planel <nplanel@mandriva.com>2003-08-27 15:43:57 +0000
committerNicolas Planel <nplanel@mandriva.com>2003-08-27 15:43:57 +0000
commitd6867c1d7c99edd043c64e3c6667796c28be408a (patch)
tree8f1b7f8348a269cb1593ed34860d5d08a9a62fa3 /perl-install
parentdb385d51f064035eb800ae4084b4cf7b0370ad29 (diff)
downloaddrakx-d6867c1d7c99edd043c64e3c6667796c28be408a.tar
drakx-d6867c1d7c99edd043c64e3c6667796c28be408a.tar.gz
drakx-d6867c1d7c99edd043c64e3c6667796c28be408a.tar.bz2
drakx-d6867c1d7c99edd043c64e3c6667796c28be408a.tar.xz
drakx-d6867c1d7c99edd043c64e3c6667796c28be408a.zip
Now acpi=ht to prevent HT detection only
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm4
-rw-r--r--perl-install/install_steps.pm5
2 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 5da1f6b0f..2b1b8413f 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -246,7 +246,7 @@ sub setupBootloader__general {
($b->{method}, my $method_choices) = bootloader::method_choices($fstab, $b);
my $profiles = bootloader::has_profiles($b);
- my $prev_force_acpi = my $force_acpi = bootloader::get_append($b, 'acpi') ne 'off';
+ my $prev_force_acpi = my $force_acpi = bootloader::get_append($b, 'acpi') ne 'off' && ne 'ht';
my $prev_force_noapic = my $force_noapic = bootloader::get_append($b, 'noapic');
my $memsize = bootloader::get_append($b, 'mem');
my $prev_clean_tmp = my $clean_tmp = any { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special} ||= []};
@@ -317,7 +317,7 @@ sub setupBootloader__general {
bootloader::set_profiles($b, $profiles);
bootloader::set_append($b, "mem", $memsize);
if ($prev_force_acpi != $force_acpi) {
- bootloader::set_append($b, acpi => ($force_acpi ? '' : 'off'));
+ bootloader::set_append($b, acpi => ($force_acpi ? '' : 'ht'));
}
if ($prev_force_noapic != $force_noapic) {
($force_noapic ? \&bootloader::set_append : \&bootloader::remove_append_simple)->($b, 'noapic');
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');
}