From 44b76a6df5441d9ffc9b139f2be6297fce73b8da Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 8 Jul 2004 05:35:03 +0000
Subject: - create X_options_from_o() and use it - add freeDriver boot option

---
 perl-install/Xconfig/card.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'perl-install/Xconfig')

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).
-- 
cgit v1.2.1