summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mageia.org>2011-04-17 14:33:52 +0000
committerAnssi Hannula <anssi@mageia.org>2011-04-17 14:33:52 +0000
commite0d820f8065ce4f70d03892239e9598a73f84008 (patch)
tree92e7e854c267fabdc4756feca41251a42f405df1 /perl-install
parent978f0bb73d45dfb4411cc28bfe3585477acdd0cc (diff)
downloaddrakx-e0d820f8065ce4f70d03892239e9598a73f84008.tar
drakx-e0d820f8065ce4f70d03892239e9598a73f84008.tar.gz
drakx-e0d820f8065ce4f70d03892239e9598a73f84008.tar.bz2
drakx-e0d820f8065ce4f70d03892239e9598a73f84008.tar.xz
drakx-e0d820f8065ce4f70d03892239e9598a73f84008.zip
service_harddrake: handle adding/removing nokmsboot when switching the driver.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/service_harddrake4
2 files changed, 5 insertions, 0 deletions
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 {