summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-12-15 16:57:07 +0000
committerThierry Vignaud <tv@mandriva.org>2008-12-15 16:57:07 +0000
commit6372a2cca6faf1ccb47a85465cee4aa08317ebb4 (patch)
tree1db4bb5a7f7323d516e12e50539aa7e5a265f0a6
parent6599fbf06dcd3fab1a4f2e425c2051ac746b6ab8 (diff)
downloaddrakx-6372a2cca6faf1ccb47a85465cee4aa08317ebb4.tar
drakx-6372a2cca6faf1ccb47a85465cee4aa08317ebb4.tar.gz
drakx-6372a2cca6faf1ccb47a85465cee4aa08317ebb4.tar.bz2
drakx-6372a2cca6faf1ccb47a85465cee4aa08317ebb4.tar.xz
drakx-6372a2cca6faf1ccb47a85465cee4aa08317ebb4.zip
(setupBootloader__general) enable to disable SMP support (#31339)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/any.pm7
2 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 54640ffc2..a6206b01b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
- diskdrake:
o fix crashing on writing fstab when using SMB (#46084)
o fix racing with udev (#41832)
+- drakboot:
+ o enable to disable SMP support (#31339)
- scannerdrake:
o install task-scanning (so that xsane-gimp got installed)
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 0304df559..31433594b 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -380,6 +380,7 @@ sub setupBootloader__general {
my $prev_force_acpi = my $force_acpi = bootloader::get_append_with_key($b, 'acpi') !~ /off|ht/;
my $prev_enable_apic = my $enable_apic = !bootloader::get_append_simple($b, 'noapic');
my $prev_enable_lapic = my $enable_lapic = !bootloader::get_append_simple($b, 'nolapic');
+ my $prev_enable_smp = my $enable_smp = !bootloader::get_append_simple($b, 'nosmp');
my $prev_clean_tmp = my $clean_tmp = any { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special} ||= []};
my $prev_boot = $b->{boot};
my $prev_method = $b->{method};
@@ -407,6 +408,7 @@ sub setupBootloader__general {
{ label => N("Main options"), title => 1 },
{ label => N("Delay before booting default image"), val => \$b->{timeout} },
{ text => N("Enable ACPI"), val => \$force_acpi, type => 'bool' },
+ { text => N("Enable SMP"), val => \$enable_smp, type => 'bool', advanced => 1 },
{ text => N("Enable APIC"), val => \$enable_apic, type => 'bool', advanced => 1, disabled => sub { !$enable_lapic } },
{ text => N("Enable Local APIC"), val => \$enable_lapic, type => 'bool', advanced => 1 },
if_($security >= 4 || $b->{password} || $b->{restricted},
@@ -455,6 +457,11 @@ sub setupBootloader__general {
if ($prev_force_acpi != $force_acpi) {
bootloader::set_append_with_key($b, acpi => ($force_acpi ? '' : 'ht'));
}
+
+ if ($prev_enable_smp != $enable_smp) {
+ ($enable_smp ? \&bootloader::remove_append_simple : \&bootloader::set_append_simple)->($b, 'nosmp');
+ }
+
if ($prev_enable_apic != $enable_apic) {
($enable_apic ? \&bootloader::remove_append_simple : \&bootloader::set_append_simple)->($b, 'noapic');
($enable_apic ? \&bootloader::set_append_simple : \&bootloader::remove_append_simple)->($b, 'apic');