summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-11-21 15:52:23 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-11-21 15:52:23 +0000
commit2ca566489f36579389293d760f014589e9ca75a6 (patch)
treeabc7655a8acb26c6b031ef94ae0160fb7a566b4e
parentd5769a45eb82bfcb96105365fa0d8920570b4ae9 (diff)
downloaddrakx-2ca566489f36579389293d760f014589e9ca75a6.tar
drakx-2ca566489f36579389293d760f014589e9ca75a6.tar.gz
drakx-2ca566489f36579389293d760f014589e9ca75a6.tar.bz2
drakx-2ca566489f36579389293d760f014589e9ca75a6.tar.xz
drakx-2ca566489f36579389293d760f014589e9ca75a6.zip
load kernel module "nvidia" when using nvidia in XFree
-rw-r--r--move/move.pm23
1 files changed, 15 insertions, 8 deletions
diff --git a/move/move.pm b/move/move.pm
index d33ee1654..af8c85c4c 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -506,17 +506,24 @@ sub install2::startMove {
sub automatic_xconf {
my ($o) = @_;
- $using_existing_host_config and return;
+ if (!$using_existing_host_config) {
- log::l('automatic XFree configuration');
+ log::l('automatic XFree configuration');
- require Xconfig::default;
- $o->{raw_X} = Xconfig::default::configure({ KEYBOARD => 'uk' }, $o->{mouse}); #- using uk instead of us for now to have less warnings
+ require Xconfig::default;
+ $o->{raw_X} = Xconfig::default::configure({ KEYBOARD => 'uk' }, $o->{mouse}); #- using uk instead of us for now to have less warnings
- require Xconfig::main;
- require class_discard;
- Xconfig::main::configure_everything_auto_install($o->{raw_X}, class_discard->new, {},
- { allowNVIDIA_rpms => [], allowATI_rpms => [], allowFB => $o->{allowFB} });
+ require Xconfig::main;
+ require class_discard;
+ Xconfig::main::configure_everything_auto_install($o->{raw_X}, class_discard->new, {},
+ { allowNVIDIA_rpms => [], allowATI_rpms => [], allowFB => $o->{allowFB} });
+
+ my $card = Xconfig::card::from_raw_X($o->{raw_X});
+ }
+
+ if (cat_('/etc/X11/XF86Config-4') =~ /Driver\s*"nvidia"/) {
+ modules::load('nvidia');
+ }
}