diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-02-25 08:42:31 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-02-25 08:42:31 +0000 |
| commit | d89c9b595d7b8e5652e509ed7fc6f1441bec3b58 (patch) | |
| tree | 60816f6669451cabc87ece12e19b81cf1e08c830 | |
| parent | bd98f7a8ce80dc6fbd0782bb899acadc15904a86 (diff) | |
| download | drakx-d89c9b595d7b8e5652e509ed7fc6f1441bec3b58.tar drakx-d89c9b595d7b8e5652e509ed7fc6f1441bec3b58.tar.gz drakx-d89c9b595d7b8e5652e509ed7fc6f1441bec3b58.tar.bz2 drakx-d89c9b595d7b8e5652e509ed7fc6f1441bec3b58.tar.xz drakx-d89c9b595d7b8e5652e509ed7fc6f1441bec3b58.zip | |
prevent wrongly notifying we switched from proprietary to free driver
(anssi, #41969) (regression introduced in r248278 on 16 October 2008)
| -rw-r--r-- | perl-install/NEWS | 5 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 0c1a21461..006437e7f 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,8 @@ +- harddrake: + o prevent wrongly notifying we switched from proprietary to free + driver (anssi, #41969) + (regression introduced in 11.70 on 16 October 2008) + Version 11.90 - 25 February 2009 - drakboot diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index ce7a98fbb..e5af418f4 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -88,7 +88,7 @@ foreach my $card (@cards) { require Xconfig::card; my @cards = Xconfig::card::probe(); my $driver = $cards[0]{Driver}; - my $new_driver = $1 if cat_('/etc/X11/xorg.conf') =~ /Driver "($card->{xorg_driver_regexp})/; + my $new_driver = $1 if cat_('/etc/X11/xorg.conf') =~ /Driver "($card->{xorg_driver_regexp})"/; if ($new_driver) { cp_af('/etc/X11/xorg.conf', "/etc/X11/xorg.conf.mdv$^T"); substInFile { s!Driver "($card->{xorg_driver_regexp})"!Driver "$driver"!g } '/etc/X11/xorg.conf'; |