summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-10-29 11:34:15 +0000
committerThierry Vignaud <tv@mandriva.org>2009-10-29 11:34:15 +0000
commit1f0ff5f28ec6368e6a9c71c5858770a60ed8ea30 (patch)
tree93d2c73b1d072870071ea0996bf04c90ffc8be3e
parentf3b624660cc445a7ff79d4a07fb2705ac49c6e6e (diff)
downloaddrakx-1f0ff5f28ec6368e6a9c71c5858770a60ed8ea30.tar
drakx-1f0ff5f28ec6368e6a9c71c5858770a60ed8ea30.tar.gz
drakx-1f0ff5f28ec6368e6a9c71c5858770a60ed8ea30.tar.bz2
drakx-1f0ff5f28ec6368e6a9c71c5858770a60ed8ea30.tar.xz
drakx-1f0ff5f28ec6368e6a9c71c5858770a60ed8ea30.zip
fix detecting nvidia71xx and nvidia96xx nvidia proprietary driver when
checking if current xorg driver still supports current card
-rw-r--r--perl-install/NEWS4
-rwxr-xr-xperl-install/standalone/service_harddrake2
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 27c73bce3..c10f4be11 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- service_harddrake:
+ o fix detecting nvidia71xx and nvidia96xx nvidia proprietary driver
+ when checking if current xorg driver still supports current card
+
Version 12.74 - 28 October 2009
- partitioning wizard (Windows resize):
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index d709a4fea..b8720e1f6 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -127,7 +127,7 @@ foreach my $device (@devices) {
# nvidia proprietary driver in ldetect-lst can be 'nvidia173', 'nvidia-current', ...
# but really is just 'nvidia' in xorg.conf:
- $card_data->{Driver2} =~ s/(nvidia)-.*/$1/;
+ $card_data->{Driver2} =~ s/(nvidia).*/$1/;
# auto reconfigure x11 only on first time default driver have changed:
my $new_key = $card_data->{Driver} . $card_data->{Driver2};