Mageia Bugzilla – Attachment 9265 Details for
Bug 20455
Vbox upgrade from 5 to 6 breaks due to changing driver from vboxvideo to modesetting but keeping nomodeset argument
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
Proposed fix part1
0001-Remove-nomodeset-boot-option-when-modesetting-driver.patch (text/plain), 1.23 KB, created by
Martin Whitaker
on 2017-05-06 14:52:06 CEST
(
hide
)
Description:
Proposed fix part1
Filename:
MIME Type:
Creator:
Martin Whitaker
Created:
2017-05-06 14:52:06 CEST
Size:
1.23 KB
patch
obsolete
>From b70e2556da6d6501fb263a2b57e1fdff29afce5d Mon Sep 17 00:00:00 2001 >From: Martin Whitaker <martin@wotan.local.net> >Date: Sat, 6 May 2017 12:21:47 +0100 >Subject: [PATCH] Remove 'nomodeset' boot option when modesetting driver is > detected (mga#20455). > > >diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm >index ed43386..d98df16 100644 >--- a/lib/Xconfig/various.pm >+++ b/lib/Xconfig/various.pm >@@ -413,9 +413,13 @@ sub setup_kms() { > sub { > my ($bootloader) = @_; > my $kms_ok = run_program::rooted($::prefix, "/sbin/display_driver_helper", "--is-kms-allowed") || 0; >- return if $kms_ok != bootloader::get_append_simple($bootloader, "nokmsboot"); >+ my $nokmsboot = bootloader::get_append_simple($bootloader, "nokmsboot"); >+ my $nomodeset = bootloader::get_append_simple($bootloader, "nomodeset"); >+ my $kms_disabled = $nokmsboot || $nomodeset; >+ return if $kms_ok != $kms_disabled; > if ($kms_ok) { >- bootloader::remove_append_simple($bootloader, "nokmsboot"); >+ bootloader::remove_append_simple($bootloader, "nokmsboot") if $nokmsboot; >+ bootloader::remove_append_simple($bootloader, "nomodeset") if $nomodeset; > } else { > bootloader::set_append_simple($bootloader, "nokmsboot"); > } >-- >2.10.2 >
From b70e2556da6d6501fb263a2b57e1fdff29afce5d Mon Sep 17 00:00:00 2001 From: Martin Whitaker <martin@wotan.local.net> Date: Sat, 6 May 2017 12:21:47 +0100 Subject: [PATCH] Remove 'nomodeset' boot option when modesetting driver is detected (mga#20455). diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm index ed43386..d98df16 100644 --- a/lib/Xconfig/various.pm +++ b/lib/Xconfig/various.pm @@ -413,9 +413,13 @@ sub setup_kms() { sub { my ($bootloader) = @_; my $kms_ok = run_program::rooted($::prefix, "/sbin/display_driver_helper", "--is-kms-allowed") || 0; - return if $kms_ok != bootloader::get_append_simple($bootloader, "nokmsboot"); + my $nokmsboot = bootloader::get_append_simple($bootloader, "nokmsboot"); + my $nomodeset = bootloader::get_append_simple($bootloader, "nomodeset"); + my $kms_disabled = $nokmsboot || $nomodeset; + return if $kms_ok != $kms_disabled; if ($kms_ok) { - bootloader::remove_append_simple($bootloader, "nokmsboot"); + bootloader::remove_append_simple($bootloader, "nokmsboot") if $nokmsboot; + bootloader::remove_append_simple($bootloader, "nomodeset") if $nomodeset; } else { bootloader::set_append_simple($bootloader, "nokmsboot"); } -- 2.10.2
View Attachment As Raw
Actions:
View
Attachments on
bug 20455
:
9071
|
9072
|
9162
|
9163
|
9164
| 9265 |
9266