From e0d820f8065ce4f70d03892239e9598a73f84008 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mageia.org>
Date: Sun, 17 Apr 2011 14:33:52 +0000
Subject: service_harddrake: handle adding/removing nokmsboot when switching
 the driver.

---
 perl-install/NEWS                         | 1 +
 perl-install/standalone/service_harddrake | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2edd99a43..880719072 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - service_harddrake:
   o adapt splash handling for plymouth (for showing dialogs)
+  o add/remove nokmsboot boot option if needed when switching the driver
 
 Version 13.47
 - modify a string in partitioning_wizard.pm to be more grammatically correct
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 80c071897..f9409d01d 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -24,6 +24,7 @@ use harddrake::data;
 use harddrake::autoconf;
 use harddrake::sound;
 use Xconfig::card;
+use Xconfig::various;
 use modules;
 use Storable qw(store retrieve);
 
@@ -116,10 +117,13 @@ sub switch_x_driver {
         log::explanations("would switch X.org driver from '$old_driver' to '$new_driver' ($reason); but new driver is not installed");
         return;
     }
+    # This should use calls to Xconfig instead of substitution. However, currently
+    # Xconfig probably makes too intrusive changes to xorg.conf when switching the driver.
     cp_af('/etc/X11/xorg.conf', "/etc/X11/xorg.conf.mga$^T");
     substInFile { s!Driver "($old_driver)"!Driver "$new_driver"!g } '/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();
 }
 
 sub should_reconfigure_x_driver {
-- 
cgit v1.2.1