summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-10-27 10:52:09 +0000
committerThierry Vignaud <tv@mandriva.org>2009-10-27 10:52:09 +0000
commit20bad4d61c07559f1e1f5b5ce52679e520328585 (patch)
treebe96536ee12dcd87b268bd429ff0a9de61f61679
parent3738a03d0b17123578001082d47ccd8b749293f6 (diff)
downloaddrakx-20bad4d61c07559f1e1f5b5ce52679e520328585.tar
drakx-20bad4d61c07559f1e1f5b5ce52679e520328585.tar.gz
drakx-20bad4d61c07559f1e1f5b5ce52679e520328585.tar.bz2
drakx-20bad4d61c07559f1e1f5b5ce52679e520328585.tar.xz
drakx-20bad4d61c07559f1e1f5b5ce52679e520328585.zip
rename 'new_driver' as old_driver' (more meaningfull)
-rwxr-xr-xperl-install/standalone/service_harddrake6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 6b1898b1e..064bf1a3a 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -88,12 +88,12 @@ 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})"/;
- if ($new_driver) {
+ my $old_driver = $1 if cat_('/etc/X11/xorg.conf') =~ /Driver "($card->{xorg_driver_regexp})"/;
+ if ($old_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';
touch('/var/run/harddrake_swithed_to_free_driver');
- log::explanations("switch X.org driver from $new_driver to $driver");
+ log::explanations("switch X.org driver from $old_driver to $driver");
touch('/var/run/harddrake-notify-x11-free-driver-switch');
Xconfig::card::libgl_config_and_more({ Driver => $driver });
}