Attachment 9266 Details for Bug 20455 – Proposed fix part2

Proposed fix part2

0001-service_harddrake-require-reboot-if-nokmsboot-option.patch (text/plain), 1.04 KB, created by Martin Whitaker on 2017-05-06 14:53:57 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2017-05-06 14:53:57 CEST

Size: 1.04 KB

patch

obsolete

>From fec3227faa8605b86db734aa4826fdf07e5d2eec Mon Sep 17 00:00:00 2001
>From: Martin Whitaker <mageia@martin-whitaker.me.uk>
>Date: Sat, 6 May 2017 13:12:28 +0100
>Subject: [PATCH] service_harddrake: require reboot if nokmsboot option changed
> (mga#20455).
>
>
>diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
>index 96502d2..9ac2ebe 100755
>--- a/perl-install/standalone/service_harddrake
>+++ b/perl-install/standalone/service_harddrake
>@@ -140,9 +140,9 @@ sub switch_x_driver {
>     substInFile { s!^(\s*Driver\s+)"$old_driver"!$1"$new_driver"!i } '/etc/X11/xorg.conf';
>     log::explanations("switch X.org driver from '$old_driver' to '$new_driver' ($reason)");
>     Xconfig::card::libgl_config_and_more({ Driver => $new_driver });
>-    Xconfig::various::setup_kms();
>+    my $kms_changed = Xconfig::various::setup_kms();
> 
>-    after_x_driver_switch(); # returns 1 if reboot is needed
>+    after_x_driver_switch() || $kms_changed; # returns 1 if reboot is needed
> }
> 
> sub should_reconfigure_x_driver {
>-- 
>2.10.2
>

From fec3227faa8605b86db734aa4826fdf07e5d2eec Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 6 May 2017 13:12:28 +0100
Subject: [PATCH] service_harddrake: require reboot if nokmsboot option changed
 (mga#20455).


diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 96502d2..9ac2ebe 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -140,9 +140,9 @@ sub switch_x_driver {
     substInFile { s!^(\s*Driver\s+)"$old_driver"!$1"$new_driver"!i } '/etc/X11/xorg.conf';
     log::explanations("switch X.org driver from '$old_driver' to '$new_driver' ($reason)");
     Xconfig::card::libgl_config_and_more({ Driver => $new_driver });
-    Xconfig::various::setup_kms();
+    my $kms_changed = Xconfig::various::setup_kms();
 
-    after_x_driver_switch(); # returns 1 if reboot is needed
+    after_x_driver_switch() || $kms_changed; # returns 1 if reboot is needed
 }
 
 sub should_reconfigure_x_driver {
-- 
2.10.2

Actions: View

Attachments on bug 20455: 9071 | 9072 | 9162 | 9163 | 9164 | 9265 | 9266