summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mageia.org>2011-04-17 14:34:00 +0000
committerAnssi Hannula <anssi@mageia.org>2011-04-17 14:34:00 +0000
commit3f902d7b206ba62b09d834df7056e473ea632128 (patch)
tree0e0be84b3857a5ece7da61c76032c1669df54d25
parent71a434d123427daf29ece1599e6da86a036d1ceb (diff)
downloaddrakx-3f902d7b206ba62b09d834df7056e473ea632128.tar
drakx-3f902d7b206ba62b09d834df7056e473ea632128.tar.gz
drakx-3f902d7b206ba62b09d834df7056e473ea632128.tar.bz2
drakx-3f902d7b206ba62b09d834df7056e473ea632128.tar.xz
drakx-3f902d7b206ba62b09d834df7056e473ea632128.zip
service_harddrake: Do not switch a display driver if speedboot has already started X server, in that case simply disable speedboot for next boot.
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/service_harddrake8
2 files changed, 10 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 0ba24b8f1..3f36442dd 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,8 @@
o add/remove nokmsboot boot option if needed when switching the driver
o ask for a reboot after a driver switch if needed, and load the new driver
if no reboot is needed
+ o do not switch a display driver if speedboot has already started X server,
+ in that case simply disable speedboot for next boot
Version 13.47
- modify a string in partitioning_wizard.pm to be more grammatically correct
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index c465575ce..bc4e13aea 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -198,10 +198,18 @@ foreach my $device (@devices) {
# auto reconfigure x11 only on first time default driver have changed:
my ($should_reconfigure, $reason) = should_reconfigure_x_driver($card_data, $device, $current_driver);
if ($should_reconfigure) {
+ if (-e "/tmp/.X11-unix/X0") {
+ # We are too late, X server is already running.
+ # It was probably speedboot, disable it for next boot.
+ substInFile { s!^$curr_kernel .*\n!! } "/var/lib/speedboot/status" if -e "/var/lib/speedboot/status";
+ # Restore state as we were not able to switch the driver yet.
+ setVarsInSh("$hw_sysconfdir/xorg", { XORG_DRV => $previous_xorg_config{XORG_DRV} });
+ } else {
$reboot_needed |= switch_x_driver($current_driver, $card_data->{Driver}, $reason);
schedule_warn_about_switch($reason) if any { $current_driver =~ $_->{xorg_driver_regexp} } @cards;
# Update $current_driver with the new one
$current_driver = $card_data->{Driver};
+ }
}
# nv->nouveau or non_kms_nouveau->kms_nouveau can't have "Disable dri"!