summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-12-12 19:54:42 +0000
committerThierry Vignaud <tv@mageia.org>2011-12-12 19:54:42 +0000
commita061dd6c6a1e21a2d08d220828f9b9837e88bea9 (patch)
tree2abd900b3fbbd2d999d521e34c8fc5a9dc8dd256
parent8c2d948b35c3000c86c7c51c071c7b2e853bed93 (diff)
downloaddrakx-kbd-mouse-x11-a061dd6c6a1e21a2d08d220828f9b9837e88bea9.tar
drakx-kbd-mouse-x11-a061dd6c6a1e21a2d08d220828f9b9837e88bea9.tar.gz
drakx-kbd-mouse-x11-a061dd6c6a1e21a2d08d220828f9b9837e88bea9.tar.bz2
drakx-kbd-mouse-x11-a061dd6c6a1e21a2d08d220828f9b9837e88bea9.tar.xz
drakx-kbd-mouse-x11-a061dd6c6a1e21a2d08d220828f9b9837e88bea9.zip
(check_bad_card) do not coffer to try KMS drivers during installation
(mga#3711 and the like) TODO: check for KMS<->proprietary/vesa/fb switches
-rw-r--r--NEWS1
-rw-r--r--lib/Xconfig/card.pm6
2 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 77488ef..df5da25 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- do not offer to try KMS drivers during installation (mga#3711)
- display_driver_helper: use the new modprobe --resolve-alias instead
of manually parsing --dry-run output
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index 8a34b61..8f2c680 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -466,6 +466,12 @@ sub check_bad_card {
log::explanations("the graphics card does not like X in framebuffer") if $bad_card;
+ #- avoid testing during install at any price:
+ if (!$bad_card && !$::isStandalone) {
+ $bad_card = member($card->{Driver}, qw(ati intel nouveau));
+ log::explanations("the graphics card does not like using KMS in framebuffer") if $bad_card;
+ }
+
!$bad_card;
}