diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-14 13:23:51 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-14 13:23:51 +0000 |
commit | 4bcde88e8f31cc7c4b8e8b8ada25675b38dfc2b4 (patch) | |
tree | a1845635a5c330281e63590d96ddd64e3899dc0a /perl-install/standalone/service_harddrake | |
parent | 0584587cec2231fb3d8fdef25f3ff150603944d8 (diff) | |
download | drakx-backup-do-not-use-4bcde88e8f31cc7c4b8e8b8ada25675b38dfc2b4.tar drakx-backup-do-not-use-4bcde88e8f31cc7c4b8e8b8ada25675b38dfc2b4.tar.gz drakx-backup-do-not-use-4bcde88e8f31cc7c4b8e8b8ada25675b38dfc2b4.tar.bz2 drakx-backup-do-not-use-4bcde88e8f31cc7c4b8e8b8ada25675b38dfc2b4.tar.xz drakx-backup-do-not-use-4bcde88e8f31cc7c4b8e8b8ada25675b38dfc2b4.zip |
merge fix from HEAD
Diffstat (limited to 'perl-install/standalone/service_harddrake')
-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..91037deba 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"; |