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 | 13d8db0a3216c791c0d0659b47de33790215b570 (patch) | |
| tree | 2ab0657eaed1d9db4f9204c732a06d7e0e747528 | |
| parent | a34368be185d66de0cd5c590744e8d2e23833ada (diff) | |
| download | drakx-13d8db0a3216c791c0d0659b47de33790215b570.tar drakx-13d8db0a3216c791c0d0659b47de33790215b570.tar.gz drakx-13d8db0a3216c791c0d0659b47de33790215b570.tar.bz2 drakx-13d8db0a3216c791c0d0659b47de33790215b570.tar.xz drakx-13d8db0a3216c791c0d0659b47de33790215b570.zip | |
Add nokmsboot boot option also if the bootloader is installed after setting up a conflicting display driver (e.g. draklive-install).
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/any.pm | 5 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index f3a09f6cc..18d58dedb 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -5,6 +5,8 @@ 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 +- add nokmsboot boot option also if the bootloader is installed after setting + up a conflicting display driver (e.g. draklive-install) Version 13.47 - modify a string in partitioning_wizard.pm to be more grammatically correct 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]') && diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 4caea7afa..2ba05f661 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- add nokmsboot boot option also if the bootloader is installed after setting + up a conflicting display driver (e.g. draklive-install) + Version 13.47 - update modules list needed for md raid456 and dm-raid 4/5/6 target |