summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-10-28 18:10:11 +0000
committerThierry Vignaud <tv@mandriva.org>2009-10-28 18:10:11 +0000
commit2ef3c5b20e88c68064ea993241ac6a4f2d9fa959 (patch)
treeb8b028727db2d8ea12bc4e7c0cea9f30f2413211
parent7d5dc7a8e6698787fa4930a17ae095359675e3b1 (diff)
downloaddrakx-2ef3c5b20e88c68064ea993241ac6a4f2d9fa959.tar
drakx-2ef3c5b20e88c68064ea993241ac6a4f2d9fa959.tar.gz
drakx-2ef3c5b20e88c68064ea993241ac6a4f2d9fa959.tar.bz2
drakx-2ef3c5b20e88c68064ea993241ac6a4f2d9fa959.tar.xz
drakx-2ef3c5b20e88c68064ea993241ac6a4f2d9fa959.zip
enable to disable reconfiguring to default driver through
AUTORECONFIGURE_RIGHT_XORG_DRIVER in /etc/sysconfig/harddrake2/service.conf
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/service_harddrake2
2 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c41417cd4..630781d19 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -7,6 +7,8 @@
o really ensure keeping free space for Linux partition
o really ensure keeping free space for Windows partition
- service_harddrake:
+ o enable to disable reconfiguring to default driver through
+ /etc/sysconfig/harddrake2/service.conf
o fix detecting nvidia proprietary driver when checking if current
xorg driver still supports current card (#54943)
o do not reconfigure to default driver if it's not installed
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index a53aa9d55..eb69a2eef 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -112,6 +112,8 @@ my @cards = (
my @devices = grep { $_->{driver} =~ /^Card:/ } detect_devices::probeall();
foreach my $device (@devices) {
+ next if !text2bool($cfg{AUTORECONFIGURE_RIGHT_XORG_DRIVER});
+
my $id = $device->{driver} =~ /Card:(.*)/ && $1;
my $card_data = Xconfig::card::readCardsDB("/usr/share/ldetect-lst/Cards+")->{$id};
my $current_driver = get_xorg_driver();