summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-01-25 17:57:35 +0000
committerThierry Vignaud <tv@mandriva.org>2008-01-25 17:57:35 +0000
commitd4737400263d02a6b173b15c173c1f8d2b13d23a (patch)
tree612a6a6b855cd53964dd6477df1b3a81e5f5c51d
parentc17ffbca786949ef6e010ec8017e3f7b47315547 (diff)
downloaddrakx-d4737400263d02a6b173b15c173c1f8d2b13d23a.tar
drakx-d4737400263d02a6b173b15c173c1f8d2b13d23a.tar.gz
drakx-d4737400263d02a6b173b15c173c1f8d2b13d23a.tar.bz2
drakx-d4737400263d02a6b173b15c173c1f8d2b13d23a.tar.xz
drakx-d4737400263d02a6b173b15c173c1f8d2b13d23a.zip
backup xorg.conf before falling back to safe driver (#37182)
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/service_harddrake1
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1904b222e..aecf07d42 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,8 @@
o do not display twice "Cannot be run in console mode." message
- finish-install:
o do ask again language (got wrongly disabled in 10.6.8)
+- harddrake service:
+ o backup xorg.conf before falling back to safe driver (#37182)
Version 10.6.8 - 24 January 2008
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index dab1428a0..1affd75e9 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -71,6 +71,7 @@ foreach my $card (@cards) {
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';
if ($new_driver) {
log::explanations("switch X.org driver from $new_driver to $driver");