diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-14 13:23:16 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-14 13:23:16 +0000 |
| commit | 039f5aedf08fdd08fcf28559886e9ec252601268 (patch) | |
| tree | e2143b9ae7362f0165701f0500f39d155e8c3888 | |
| parent | 659d048cbb258c2440b79712244f07bd3804a483 (diff) | |
| download | drakx-039f5aedf08fdd08fcf28559886e9ec252601268.tar drakx-039f5aedf08fdd08fcf28559886e9ec252601268.tar.gz drakx-039f5aedf08fdd08fcf28559886e9ec252601268.tar.bz2 drakx-039f5aedf08fdd08fcf28559886e9ec252601268.tar.xz drakx-039f5aedf08fdd08fcf28559886e9ec252601268.zip | |
do not automatically switch from nv to nvidia (in order to handle
cases where nvidia module crashes the system)
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 5c4ac6811..2f5a4eb4b 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -23,8 +23,8 @@ modules::mergein_conf('/etc/modules.conf'); 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)) { - 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"; + #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 { log::explanations("switch XFree86 driver from nvidia to nv"); substInFile { s!Driver "nv.*"!Driver "nv"!g; s!([^#]Load.*glx)!#\1!g } $_ foreach "/etc/X11/XF86Config-4", "/etc/X11/XF86Config"; |