diff options
| author | Anssi Hannula <anssi@mageia.org> | 2011-04-17 14:34:07 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mageia.org> | 2011-04-17 14:34:07 +0000 |
| commit | 944a02d563c478e5b8f1ae275cd7d0fb0379dbe5 (patch) | |
| tree | 2ab0657eaed1d9db4f9204c732a06d7e0e747528 /perl-install/any.pm | |
| parent | d264e80d836317b5d5821bbc8f0a2b1f704c53e9 (diff) | |
| download | drakx-backup-do-not-use-944a02d563c478e5b8f1ae275cd7d0fb0379dbe5.tar drakx-backup-do-not-use-944a02d563c478e5b8f1ae275cd7d0fb0379dbe5.tar.gz drakx-backup-do-not-use-944a02d563c478e5b8f1ae275cd7d0fb0379dbe5.tar.bz2 drakx-backup-do-not-use-944a02d563c478e5b8f1ae275cd7d0fb0379dbe5.tar.xz drakx-backup-do-not-use-944a02d563c478e5b8f1ae275cd7d0fb0379dbe5.zip | |
Add nokmsboot boot option also if the bootloader is installed after setting up a conflicting display driver (e.g. draklive-install).
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 91300d6f1..874d6ee6e 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -179,6 +179,11 @@ sub setupBootloaderBefore { } } + #- set nokmsboot if a conflicting driver is configured. + if (-x "$::prefix/sbin/display_driver_helper" && !run_program::rooted($::prefix, "/sbin/display_driver_helper", "--is-kms-allowed")) { + bootloader::set_append_simple($bootloader, 'nokmsboot'); + } + #- check for valid fb mode to enable a default boot with frame buffer. my $vga = $allow_fb && (!detect_devices::matching_desc__regexp('3D Rage LT') && !detect_devices::matching_desc__regexp('Rage Mobility [PL]') && |