diff options
| author | Anssi Hannula <anssi@mageia.org> | 2011-04-17 14:34:04 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mageia.org> | 2011-04-17 14:34:04 +0000 |
| commit | a34368be185d66de0cd5c590744e8d2e23833ada (patch) | |
| tree | c631de954532b51125cabc2fdaeb5505a6beeacf /perl-install/standalone/service_harddrake | |
| parent | 3f902d7b206ba62b09d834df7056e473ea632128 (diff) | |
| download | drakx-a34368be185d66de0cd5c590744e8d2e23833ada.tar drakx-a34368be185d66de0cd5c590744e8d2e23833ada.tar.gz drakx-a34368be185d66de0cd5c590744e8d2e23833ada.tar.bz2 drakx-a34368be185d66de0cd5c590744e8d2e23833ada.tar.xz drakx-a34368be185d66de0cd5c590744e8d2e23833ada.zip | |
service_harddrake: Add or remove nokmsboot option if an unoptimal or fatal situation is detected.
Diffstat (limited to 'perl-install/standalone/service_harddrake')
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index bc4e13aea..c4be98a0b 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -61,6 +61,7 @@ my %cfg = getVarsFromSh("$hw_sysconfdir/service.conf"); # default to 'yes' on upgrade: $cfg{AUTORECONFIGURE_RIGHT_XORG_DRIVER} = 'yes' if !exists $cfg{AUTORECONFIGURE_RIGHT_XORG_DRIVER}; +$cfg{HANDLE_KMS_BOOT_CONFIG} = 'yes' if !exists $cfg{HANDLE_KMS_BOOT_CONFIG}; # autoreconfigure laptop-dependent services when switching from laptop to desktop, and vice versa if (!exists $previous_kernel_config{IS_LAPTOP} || $force || $isLaptop != text2bool($previous_kernel_config{IS_LAPTOP})) { @@ -253,6 +254,18 @@ foreach my $card (@cards) { } } +if (!$reboot_needed && text2bool($cfg{HANDLE_KMS_BOOT_CONFIG})) { + if (-x "/sbin/display_driver_helper" && system("display_driver_helper", "--check-loaded") != 0) { + # incorrect driver is loaded, X.org can't start (e.g. proprietary driver loaded while free driver in use, + # or free driver loaded while vesa is configured). + $reboot_needed |= Xconfig::various::setup_kms(); + } elsif (!$reboot_needed && -e "/dev/.late_kms") { + # initrd didn't load the KMS driver; non-fatal but ugly, fix it for next boot + unlink("/dev/.late_kms"); + Xconfig::various::setup_kms(); + } +} + my $is_globetrotter = -f '/usr/sbin/mdkmove'; my (%config, $wait); |