From 85c10714886e733077bd8bd1ddbfdbaea96ee781 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Mon, 12 Dec 2011 19:54:37 +0000
Subject: (check_bad_card,from_raw_X) simplify

---
 lib/Xconfig/card.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/Xconfig/card.pm')

diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index 7a10606..cb50d0a 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -43,7 +43,7 @@ sub from_raw_X {
 
     my $card = {
 	use_DRI_GLX  => eval { any { /dri/ } $raw_X->get_modules },
-	DRI_GLX_SPECIAL => $device->{Driver} eq 'nvidia' && eval { any { $_ eq 'glx' } $raw_X->get_modules },
+	DRI_GLX_SPECIAL => $device->{Driver} eq 'nvidia' && eval { member('glx', $raw_X->get_modules) },
 	%$device,
 	if_($device->{Driver} eq 'nvidia',
 	    DriverVersion => 
@@ -461,7 +461,7 @@ sub add_to_card__using_Cards {
 sub check_bad_card {
     my ($card) = @_;
     my $bad_card = $card->{BAD_FB_RESTORE};
-    $bad_card ||= $card->{Driver} eq 'intel' || $card->{Driver} eq 'fbdev';
+    $bad_card ||= member($card->{Driver}, qw(intel fbdev));
     $bad_card ||= member($card->{Driver}, '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