summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig/card.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-12-12 19:54:37 +0000
committerThierry Vignaud <tv@mageia.org>2011-12-12 19:54:37 +0000
commit85c10714886e733077bd8bd1ddbfdbaea96ee781 (patch)
tree2b256711a88feecfc8d7cddc78caa5f41730668a /lib/Xconfig/card.pm
parentdbdf6b34e7bfa52f61835af2326fbb05ff88c8cf (diff)
downloaddrakx-kbd-mouse-x11-85c10714886e733077bd8bd1ddbfdbaea96ee781.tar
drakx-kbd-mouse-x11-85c10714886e733077bd8bd1ddbfdbaea96ee781.tar.gz
drakx-kbd-mouse-x11-85c10714886e733077bd8bd1ddbfdbaea96ee781.tar.bz2
drakx-kbd-mouse-x11-85c10714886e733077bd8bd1ddbfdbaea96ee781.tar.xz
drakx-kbd-mouse-x11-85c10714886e733077bd8bd1ddbfdbaea96ee781.zip
(check_bad_card,from_raw_X) simplify
Diffstat (limited to 'lib/Xconfig/card.pm')
-rw-r--r--lib/Xconfig/card.pm4
1 files changed, 2 insertions, 2 deletions
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;