From b91b2b053ed9d07723ad088e09be525a24e3945d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 24 Mar 2004 09:59:46 +0000 Subject: switch between nv and nvidia driver if commercial driver isn't installed --- perl-install/standalone/service_harddrake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'perl-install/standalone/service_harddrake') diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 6ae94cade..7a1731c70 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -20,6 +20,14 @@ $last_boot_config .= '_X11' if $invert_do_it; modules::mergein_conf('/etc/modules.conf'); +# we need to check if graphic card is managed by nv|nivdia first: +if (find { -e join('', "/lib/modules/", c::kernel_version(), "/kernel/drivers/video/$_") } qw(NVdriver vidia.ko)) { + substInFile { s!Driver "nv.*"!Driver "nvidia"!g; s!#*( Load.*glx)!\1!g } $_ foreach "/etc/X11/XF86Config-4", "/etc/X11/XF86Config"; +} else { + substInFile { s!Driver "nv.*"!Driver "nv"!g;s!([^#]Load.*glx)!#\1!g } $_ foreach "/etc/X11/XF86Config-4", "/etc/X11/XF86Config"; +} + + # first run ? if not read old hw config my $previous_config = -f $last_boot_config && -s $last_boot_config ? Storable::retrieve($last_boot_config) : {}; $previous_config = $$previous_config if ref($previous_config) !~ /HASH/; -- cgit v1.2.1