From 74745974bcac4c715977c51bcd3f57351ff126c4 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 25 Feb 2009 08:43:25 +0000 Subject: prevent wrongly notifying we switched from proprietary to free driver (anssi, #41969) (regression introduced in r248278 on 16 October 2008) --- perl-install/NEWS | 5 +++++ perl-install/standalone/service_harddrake | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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'; -- cgit v1.2.1