summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-10-28 19:00:44 +0000
committerThierry Vignaud <tv@mandriva.org>2009-10-28 19:00:44 +0000
commitf92faa4e81480308214a28237e634750f794f556 (patch)
tree38eacad9e12948e5420b4cf2ce9e4853ae30c23c
parent9d3d7c4de0136998f51473cef37b29d5c8c1424f (diff)
downloaddrakx-f92faa4e81480308214a28237e634750f794f556.tar
drakx-f92faa4e81480308214a28237e634750f794f556.tar.gz
drakx-f92faa4e81480308214a28237e634750f794f556.tar.bz2
drakx-f92faa4e81480308214a28237e634750f794f556.tar.xz
drakx-f92faa4e81480308214a28237e634750f794f556.zip
do not auto reconfigure if more than one graphic card (rationale: the
code is not ready to handle that yet)
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/service_harddrake3
2 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 630781d19..13ec884c2 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -7,6 +7,7 @@
o really ensure keeping free space for Linux partition
o really ensure keeping free space for Windows partition
- service_harddrake:
+ o do not auto reconfigure if more than one graphic card
o enable to disable reconfiguring to default driver through
/etc/sysconfig/harddrake2/service.conf
o fix detecting nvidia proprietary driver when checking if current
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index a8a728e3d..b16df5901 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -114,6 +114,9 @@ my @cards = (
my @devices = grep { $_->{driver} =~ /^Card:/ } detect_devices::probeall();
+# do not auto reconfigure if more than one graphic card:
+$cfg{AUTORECONFIGURE_RIGHT_XORG_DRIVER} = 'no' if scalar(@devices) > 1;
+
foreach my $device (@devices) {
next if !text2bool($cfg{AUTORECONFIGURE_RIGHT_XORG_DRIVER});