summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-06-26 07:53:18 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-06-26 07:53:18 +0000
commitec35f4fa54956945e4f519ff00e2b3116ca870d1 (patch)
treef9d670ae2be1470ec21d92881ffde97b2311d109
parent1143e16036c544298fe02af7c771a01269037858 (diff)
downloaddrakx-ec35f4fa54956945e4f519ff00e2b3116ca870d1.tar
drakx-ec35f4fa54956945e4f519ff00e2b3116ca870d1.tar.gz
drakx-ec35f4fa54956945e4f519ff00e2b3116ca870d1.tar.bz2
drakx-ec35f4fa54956945e4f519ff00e2b3116ca870d1.tar.xz
drakx-ec35f4fa54956945e4f519ff00e2b3116ca870d1.zip
fix switch from nvidia to nv for X.org
-rwxr-xr-xperl-install/standalone/service_harddrake3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index bc291abfd..f6bdc298a 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -57,9 +57,10 @@ if (find { $_->{driver} =~ /Card:NVIDIA/ } detect_devices::probeall()) {
substInFile {
log::explanations("switch X.org driver from nvidia to nv") if /Driver "nv.+"/;
s!Driver "nv.*"!Driver "nv"!g;
- } $_ foreach grep { -e $_ } "/etc/X11/XF86Config-4", "/etc/X11/XF86Config";
+ } $_ foreach grep { -e $_ } "/etc/X11/XF86Config-4", "/etc/X11/XF86Config", "/etc/X11/xorg.conf";
}
}
+exit 0;
my $is_globetrotter = -f '/usr/sbin/mdkmove';