diff options
| author | Anssi Hannula <anssi@mandriva.org> | 2011-04-17 11:08:21 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mandriva.org> | 2011-04-17 11:08:21 +0000 |
| commit | 33c4095bc189b8758fd6b47d6643478d5391dbbc (patch) | |
| tree | a7471beacb08fd384eaa304a8660112427a7255f | |
| parent | 3842c37f38800bcb693f2ee51568348fce920303 (diff) | |
| download | drakx-backup-do-not-use-33c4095bc189b8758fd6b47d6643478d5391dbbc.tar drakx-backup-do-not-use-33c4095bc189b8758fd6b47d6643478d5391dbbc.tar.gz drakx-backup-do-not-use-33c4095bc189b8758fd6b47d6643478d5391dbbc.tar.bz2 drakx-backup-do-not-use-33c4095bc189b8758fd6b47d6643478d5391dbbc.tar.xz drakx-backup-do-not-use-33c4095bc189b8758fd6b47d6643478d5391dbbc.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 | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 5b720a95c..241d88973 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.42 - 24 February 2011 - increase default disk size to suggest /home partition diff --git a/perl-install/any.pm b/perl-install/any.pm index 0578c525f..a76cf12d2 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 b21c3fe17..cc146e296 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,8 @@ - fix building with new libX11 - fix building with xserver-1.9 - include missing perl modules (#60720) +- add nokmsboot boot option also if the bootloader is installed after setting + up a conflicting display driver (e.g. draklive-install) Version 13.39 - 5 August 2010 |