summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-05-06 13:12:28 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-05-06 13:12:28 +0100
commitfec3227faa8605b86db734aa4826fdf07e5d2eec (patch)
tree3699b934af6e009dbd36bde5cc8a9cf4981e1253 /perl-install/standalone
parente83e3e055e8976518a995843a673d6ab325e82d5 (diff)
downloaddrakx-fec3227faa8605b86db734aa4826fdf07e5d2eec.tar
drakx-fec3227faa8605b86db734aa4826fdf07e5d2eec.tar.gz
drakx-fec3227faa8605b86db734aa4826fdf07e5d2eec.tar.bz2
drakx-fec3227faa8605b86db734aa4826fdf07e5d2eec.tar.xz
drakx-fec3227faa8605b86db734aa4826fdf07e5d2eec.zip
service_harddrake: require reboot if nokmsboot option changed (mga#20455).
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/service_harddrake4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 96502d22f..9ac2ebed4 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 {