From b4856f76e4a7c3fde5207387e353ef79c2405c15 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 9 Feb 2004 13:47:28 +0000
Subject: handle allowNVIDIA_rpms & allowATI_rpms directly in
 Xconfig::card::install_server

---
 perl-install/install_steps.pm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 7e78385af..d73d2cd7e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -890,10 +890,7 @@ sub configureX {
     $o->{raw_X} = Xconfig::default::configure($o->{keyboard}, $o->{mouse});
 
     require Xconfig::main;
-    Xconfig::main::configure_everything_auto_install($o->{raw_X}, $o->do_pkgs, $o->{X},
-			  { allowFB          => $o->{allowFB},
-			    allowNVIDIA_rpms => $o->do_pkgs->check_kernel_module_packages('NVIDIA_kernel', 'NVIDIA_GLX'),
-			  });
+    Xconfig::main::configure_everything_auto_install($o->{raw_X}, $o->do_pkgs, $o->{X}, { allowFB => $o->{allowFB} });
     configureXAfter($o);
 }
 sub configureXAfter {
-- 
cgit v1.2.1