diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-04-05 08:12:35 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-04-05 08:12:35 +0000 |
| commit | ec96c903d353d813df1cd4ad23ce65e20df55d96 (patch) | |
| tree | 74da9cbd1c321968a75350fca4e5704fe0a0267e | |
| parent | 2683c67adfc63dfbd68a13f199c5929d2877c9e5 (diff) | |
| download | drakx-backup-do-not-use-ec96c903d353d813df1cd4ad23ce65e20df55d96.tar drakx-backup-do-not-use-ec96c903d353d813df1cd4ad23ce65e20df55d96.tar.gz drakx-backup-do-not-use-ec96c903d353d813df1cd4ad23ce65e20df55d96.tar.bz2 drakx-backup-do-not-use-ec96c903d353d813df1cd4ad23ce65e20df55d96.tar.xz drakx-backup-do-not-use-ec96c903d353d813df1cd4ad23ce65e20df55d96.zip | |
log nv<=>nvidia switches
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 2511ec87a..842fb60fd 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -23,8 +23,10 @@ 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"; } 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"; } } |