diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-02-25 08:43:25 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-02-25 08:43:25 +0000 |
| commit | 74745974bcac4c715977c51bcd3f57351ff126c4 (patch) | |
| tree | 3b9709d6cb1ee19abcb8c9c9be552ee6c73fecaf | |
| parent | b0478cf1b0d6d6fccbd4ffba67764d8e735f77f6 (diff) | |
| download | drakx-74745974bcac4c715977c51bcd3f57351ff126c4.tar drakx-74745974bcac4c715977c51bcd3f57351ff126c4.tar.gz drakx-74745974bcac4c715977c51bcd3f57351ff126c4.tar.bz2 drakx-74745974bcac4c715977c51bcd3f57351ff126c4.tar.xz drakx-74745974bcac4c715977c51bcd3f57351ff126c4.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 0ff5af611..1148539c2 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.71.7 - 15 January 2009 - diskdrake: 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'; |