From 4bcde88e8f31cc7c4b8e8b8ada25675b38dfc2b4 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 14 Jun 2004 13:23:51 +0000 Subject: merge fix from HEAD --- perl-install/standalone/service_harddrake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install/standalone') 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"; -- cgit v1.2.1