From 6529d4eac31f3230501e18cc93add6fb1a597399 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 16 Oct 2008 12:21:56 +0000
Subject: do not backup xorg.conf if we won't change the driver

---
 perl-install/NEWS                         | 2 ++
 perl-install/standalone/service_harddrake | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 0ed09f69a..967f4bc8d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,8 @@
 - libDrakX:
   o share infrastructure so that rpmdrake can get rid of some gray
     windows
+- harddrake service:
+  o do not backup xorg.conf if we won't change the driver
 
 Version 11.67 - 2 October 2008
 
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 8a91146ef..ce7a98fbb 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -88,10 +88,11 @@ foreach my $card (@cards) {
         require Xconfig::card;
         my @cards = Xconfig::card::probe();
         my $driver = $cards[0]{Driver};
-        my $new_driver;
-        cp_af('/etc/X11/xorg.conf', "/etc/X11/xorg.conf.mdv$^T");
-        substInFile { $new_driver = $1 if s!Driver "($card->{xorg_driver_regexp})"!Driver "$driver"!g } '/etc/X11/xorg.conf';
+        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';
+            touch('/var/run/harddrake_swithed_to_free_driver');
             log::explanations("switch X.org driver from $new_driver to $driver");
             touch('/var/run/harddrake-notify-x11-free-driver-switch');
             Xconfig::card::libgl_config_and_more({ Driver => $driver });
-- 
cgit v1.2.1