summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-10 14:12:17 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-10 14:12:17 +0000
commitc2840b163c8850de05589f7541484ec04d347d8b (patch)
tree6313f0ea561ab17ac5479395bf4f001a03865ecc
parent6433e4d67d2c0cb063f02f0bac4ab569bb1a6fe8 (diff)
downloaddrakx-c2840b163c8850de05589f7541484ec04d347d8b.tar
drakx-c2840b163c8850de05589f7541484ec04d347d8b.tar.gz
drakx-c2840b163c8850de05589f7541484ec04d347d8b.tar.bz2
drakx-c2840b163c8850de05589f7541484ec04d347d8b.tar.xz
drakx-c2840b163c8850de05589f7541484ec04d347d8b.zip
(setupBootloader__general) fix nolapic/lapic logic due to altered kernel settings
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/NEWS3
3 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index db5c49a44..0181437ca 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot
+ o fix nolapic/lapic logic due to altered kernel settings
+
Version 11.38 - 8 September 2008
- libDrakX:
diff --git a/perl-install/any.pm b/perl-install/any.pm
index c0005e1e3..0529ed46b 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -457,9 +457,11 @@ sub setupBootloader__general {
}
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');
}
if ($prev_enable_lapic != $enable_lapic) {
($enable_lapic ? \&bootloader::remove_append_simple : \&bootloader::set_append_simple)->($b, 'nolapic');
+ ($enable_lapic ? \&bootloader::set_append_simple : \&bootloader::remove_append_simple)->($b, 'lapic');
}
if ($prev_clean_tmp != $clean_tmp) {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c562747be..e9df63efa 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- drakboot
+ o fix nolapic/lapic logic due to altered kernel settings
+
Version 11.39 - 9 September 2008
- do not use UUID for software raid, only for hdx and sdx