summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-10-04 07:21:34 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-10-04 07:21:34 +0000
commit150a041d725f76c503ba1cf6dd9ea2000a704d9f (patch)
treef6efbb19d761a7584cfed9c3a6981bd5ff71f7dc
parent237ff88644c53046c933f6aaf18de8bc5515cb0d (diff)
downloaddrakx-150a041d725f76c503ba1cf6dd9ea2000a704d9f.tar
drakx-150a041d725f76c503ba1cf6dd9ea2000a704d9f.tar.gz
drakx-150a041d725f76c503ba1cf6dd9ea2000a704d9f.tar.bz2
drakx-150a041d725f76c503ba1cf6dd9ea2000a704d9f.tar.xz
drakx-150a041d725f76c503ba1cf6dd9ea2000a704d9f.zip
do not disable glx when switching from nvidia driver to nv (indirect support, #11285)
-rwxr-xr-xperl-install/standalone/service_harddrake1
1 files changed, 0 insertions, 1 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 08114a63c..9efe46b3f 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -57,7 +57,6 @@ if (find { $_->{driver} =~ /Card:NVIDIA/ } detect_devices::probeall()) {
substInFile {
log::explanations("switch XFree86 driver from nvidia to nv") if /Driver "nv.+"/;
s!Driver "nv.*"!Driver "nv"!g;
- s!([^#]Load.*glx)!#$1!g;
} $_ foreach grep { -e $_ } "/etc/X11/XF86Config-4", "/etc/X11/XF86Config";
}
}