summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-03-29 06:54:43 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-03-29 06:54:43 +0000
commitb2925d9078f96b4d389883fda3a86400db702a47 (patch)
tree4210c959797d333ad704a23cb59f9243118e52fb
parentb0dfd7971d69252ffca1be0817bd62a0fd07f190 (diff)
downloaddrakx-b2925d9078f96b4d389883fda3a86400db702a47.tar
drakx-b2925d9078f96b4d389883fda3a86400db702a47.tar.gz
drakx-b2925d9078f96b4d389883fda3a86400db702a47.tar.bz2
drakx-b2925d9078f96b4d389883fda3a86400db702a47.tar.xz
drakx-b2925d9078f96b4d389883fda3a86400db702a47.zip
check for compressed nvidia modules too
-rwxr-xr-xperl-install/standalone/service_harddrake2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index af1b228de..03ade66bb 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -21,7 +21,7 @@ $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 nvidia.ko)) {
+if (find { -e join('', "/lib/modules/", c::kernel_version(), "/kernel/drivers/video/$_") } qw(NVdriver nvidia.o nvidia.o.gz nvidia.ko nvidia.ko.gz)) {
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";