From 29a4a0d974bde2265616bf082c4982ba221373a3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 13 Apr 2015 09:19:20 -0400 Subject: do not propose to test modesetting in stage2 thus fixing mga#15687 --- NEWS | 2 ++ lib/Xconfig/card.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c816c33..9fedb1d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- do not propose to test modesetting in stage2 (mga#15687) + Version 1.6 - 11 February 2015 - suppress writing xorg.conf.d snippets for built in evdev defaults (mga#14476) diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm index cf07001..276fb9f 100644 --- a/lib/Xconfig/card.pm +++ b/lib/Xconfig/card.pm @@ -466,7 +466,7 @@ sub check_bad_card { my ($card) = @_; my $bad_card = $card->{BAD_FB_RESTORE}; $bad_card ||= member($card->{Driver}, qw(intel fbdev)); - $bad_card ||= member($card->{Driver}, 'nvidia', 'vmware') if !$::isStandalone; #- avoid testing during install at any price. + $bad_card ||= member($card->{Driver}, qw(modesetting nvidia vmware)) if !$::isStandalone; #- avoid testing during install at any price. log::explanations("the graphics card does not like X in framebuffer") if $bad_card; -- cgit v1.2.1