diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-11-17 12:35:30 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-11-17 12:35:30 +0000 |
| commit | 8ebff7debe2a9e7e4e22cdd3ea8b1d0c67c97835 (patch) | |
| tree | ad102eb140732104a4bb4526a677470b62477fbb | |
| parent | e09701e257d5b3f1f05ccb9b4e708de3c25fe4e0 (diff) | |
| download | drakx-backup-do-not-use-8ebff7debe2a9e7e4e22cdd3ea8b1d0c67c97835.tar drakx-backup-do-not-use-8ebff7debe2a9e7e4e22cdd3ea8b1d0c67c97835.tar.gz drakx-backup-do-not-use-8ebff7debe2a9e7e4e22cdd3ea8b1d0c67c97835.tar.bz2 drakx-backup-do-not-use-8ebff7debe2a9e7e4e22cdd3ea8b1d0c67c97835.tar.xz drakx-backup-do-not-use-8ebff7debe2a9e7e4e22cdd3ea8b1d0c67c97835.zip | |
backport from 10.1: adapt to new nvidia driver location due to
corporate now using DKMS
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index e107edf57..b12c5d3f3 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -30,7 +30,7 @@ setVarsInSh("$hw_sysconfdir/kernel", { KERNEL => $curr_kernel }); system("mousedrake --auto") if $curr_kernel ne $prev_kernel; if (find { $_->{driver} =~ /Card:NVIDIA/ } detect_devices::probeall()) { - if (find { -e join('', "/lib/modules/", c::kernel_version(), "/kernel/drivers/$_") } map { ("video/$_", "char/$_") } qw(NVdriver nvidia.o nvidia.o.gz nvidia.ko nvidia.ko.gz)) { + if (find { -e join('', "/lib/modules/", c::kernel_version(), "/kernel/drivers/$_") } map { ("video/$_", "char/$_", "char/drm/$_") } qw(NVdriver nvidia.o nvidia.o.gz nvidia.ko nvidia.ko.gz)) { # log::explanations("switch XFree86 driver from nv to nvidia"); # substInFile { s!Driver "nv.*"!Driver "nvidia"!g; s!#*( Load.*glx)!\1!g } $_ foreach "/etc/X11/XF86Config-4", "/etc/X11/XF86Config"; } else { |