diff options
| author | Nicolas Planel <nplanel@mandriva.com> | 2003-08-27 15:43:57 +0000 |
|---|---|---|
| committer | Nicolas Planel <nplanel@mandriva.com> | 2003-08-27 15:43:57 +0000 |
| commit | d6867c1d7c99edd043c64e3c6667796c28be408a (patch) | |
| tree | 8f1b7f8348a269cb1593ed34860d5d08a9a62fa3 | |
| parent | db385d51f064035eb800ae4084b4cf7b0370ad29 (diff) | |
| download | drakx-backup-do-not-use-d6867c1d7c99edd043c64e3c6667796c28be408a.tar drakx-backup-do-not-use-d6867c1d7c99edd043c64e3c6667796c28be408a.tar.gz drakx-backup-do-not-use-d6867c1d7c99edd043c64e3c6667796c28be408a.tar.bz2 drakx-backup-do-not-use-d6867c1d7c99edd043c64e3c6667796c28be408a.tar.xz drakx-backup-do-not-use-d6867c1d7c99edd043c64e3c6667796c28be408a.zip | |
Now acpi=ht to prevent HT detection only
| -rwxr-xr-x | make_boot_img | 2 | ||||
| -rw-r--r-- | perl-install/any.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/make_boot_img b/make_boot_img index dda3c505a..a89a156e6 100755 --- a/make_boot_img +++ b/make_boot_img @@ -15,7 +15,7 @@ rename 'all.kernels', 'kernel/all.kernels'; rename 'all.modules', 'kernel/all.modules'; $default_append = "ramdisk_size=128000 root=/dev/ram3"; -$default_acpi = "acpi=off"; +$default_acpi = "acpi=ht"; $default_vga = "vga=788"; $instdir = "mdk-stage1"; 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'); } |