summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Planel <nplanel@mandriva.com>2004-03-23 10:35:34 +0000
committerNicolas Planel <nplanel@mandriva.com>2004-03-23 10:35:34 +0000
commit5a9b16239716ce14fb9c82831ca61dccc972875a (patch)
treec3ba76b77d8d73cdd480d615440d4ee92464bc0a
parent2f827e780cc59cced92537d81774b4c131abb528 (diff)
downloaddrakx-5a9b16239716ce14fb9c82831ca61dccc972875a.tar
drakx-5a9b16239716ce14fb9c82831ca61dccc972875a.tar.gz
drakx-5a9b16239716ce14fb9c82831ca61dccc972875a.tar.bz2
drakx-5a9b16239716ce14fb9c82831ca61dccc972875a.tar.xz
drakx-5a9b16239716ce14fb9c82831ca61dccc972875a.zip
add nolapic support option (NOn Local APIC)
-rw-r--r--perl-install/any.pm9
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 14676c14f..f21b64b33 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -200,6 +200,7 @@ sub setupBootloader__general {
my $profiles = bootloader::has_profiles($b);
my $prev_force_acpi = my $force_acpi = bootloader::get_append($b, 'acpi') !~ /off|ht/;
my $prev_force_noapic = my $force_noapic = bootloader::get_append($b, 'noapic');
+ my $prev_force_nolapic = my $force_nolapic = bootloader::get_append($b, 'nolapic');
my $memsize = bootloader::get_append($b, 'mem');
my $prev_clean_tmp = my $clean_tmp = any { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special} ||= []};
my $prev_boot = $b->{boot};
@@ -227,7 +228,10 @@ sub setupBootloader__general {
),
{ label => N("Delay before booting default image"), val => \$b->{timeout} },
{ text => N("Enable ACPI"), val => \$force_acpi, type => 'bool' },
- { text => N("Force No APIC"), val => \$force_noapic, type => 'bool' },
+ if_(!$force_nolapic,
+ { text => N("Force No APIC"), val => \$force_noapic, type => 'bool' },
+ ),
+ { text => N("Force No Local APIC"), val => \$force_nolapic, type => 'bool' },
if_($security >= 4 || $b->{password} || $b->{restricted},
{ label => N("Password"), val => \$b->{password}, hidden => 1 },
{ label => N("Password (again)"), val => \$b->{password2}, hidden => 1 },
@@ -270,6 +274,9 @@ sub setupBootloader__general {
if ($prev_force_noapic != $force_noapic) {
($force_noapic ? \&bootloader::set_append : \&bootloader::remove_append_simple)->($b, 'noapic');
}
+ if ($prev_force_nolapic != $force_nolapic) {
+ ($force_nolapic ? \&bootloader::set_append : \&bootloader::remove_append_simple)->($b, 'nolapic');
+ }
if ($prev_clean_tmp != $clean_tmp) {
if ($clean_tmp && !fsedit::has_mntpoint('/tmp', $all_hds)) {