summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig/card.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-08 05:35:03 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-08 05:35:03 +0000
commit44b76a6df5441d9ffc9b139f2be6297fce73b8da (patch)
tree5162afe8e7b0528778d97947cf5e93fcd45dfa78 /perl-install/Xconfig/card.pm
parent74532016c19d917b0cacd105e34e30e21745e344 (diff)
downloaddrakx-44b76a6df5441d9ffc9b139f2be6297fce73b8da.tar
drakx-44b76a6df5441d9ffc9b139f2be6297fce73b8da.tar.gz
drakx-44b76a6df5441d9ffc9b139f2be6297fce73b8da.tar.bz2
drakx-44b76a6df5441d9ffc9b139f2be6297fce73b8da.tar.xz
drakx-44b76a6df5441d9ffc9b139f2be6297fce73b8da.zip
- create X_options_from_o() and use it
- add freeDriver boot option
Diffstat (limited to 'perl-install/Xconfig/card.pm')
-rw-r--r--perl-install/Xconfig/card.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 0d21dcf7d..60c7f4505 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -274,7 +274,7 @@ sub configure {
}
sub install_server {
- my ($card, $_options, $do_pkgs) = @_;
+ my ($card, $options, $do_pkgs) = @_;
my $prog = "$::prefix/usr/X11R6/bin/Xorg";
@@ -289,6 +289,10 @@ sub install_server {
push @packages, 'xorg-x11-glide-module' if $card->{card_name} =~ /Voodoo/;
}
+ if ($options->{freeDriver}) {
+ delete $card->{Driver2};
+ }
+
my %proprietary_Driver2 = (
nvidia => [ 'NVIDIA_kernel', 'NVIDIA_GLX' ], #- using NVIDIA driver (TNT, TN2 and GeForce cards only).
fglrx => [ 'ATI_kernel', 'ATI_GLX' ], #- using ATI fglrx driver (Radeon, Fire GL cards only).