From 38505925a80c53dfb3ec7f7197bea6ada273634a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 28 Oct 2009 16:06:53 +0000 Subject: fix detecting nvidia proprietary driver when checking if current xorg driver still supports current card (#54943) rationale: nvidia proprietary driver in ldetect-lst can be 'nvidia173', rnvidia-current', ... but really is just 'nvidia' in xorg.conf --- perl-install/standalone/service_harddrake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'perl-install/standalone') diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 5848975e1..9b1ac5274 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -103,6 +103,10 @@ foreach my $device (@devices) { my $card_data = Xconfig::card::readCardsDB("/usr/share/ldetect-lst/Cards+")->{$id}; my $current_driver = get_xorg_driver(); + # 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/; + if (!member($current_driver, $card_data->{Driver}, $card_data->{Driver2}, 'fbdev', 'vesa')) { switch_x_driver($current_driver, $card_data->{Driver}, 'no more supported by this driver'); schedule_warn_about_switch() if any { $current_driver =~ $_->{xorg_driver_regexp} } @cards; -- cgit v1.2.1