diff options
| author | Anssi Hannula <anssi@mandriva.org> | 2011-04-17 11:08:08 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mandriva.org> | 2011-04-17 11:08:08 +0000 |
| commit | 8d292ef16e45810732b28c37bc2d77aff110670b (patch) | |
| tree | d10429b59030c8e4a98ea2812ac8b564b4940e18 /perl-install/standalone | |
| parent | e8768b71c45803e582da0fd1edbfa79030d38c7a (diff) | |
| download | drakx-8d292ef16e45810732b28c37bc2d77aff110670b.tar drakx-8d292ef16e45810732b28c37bc2d77aff110670b.tar.gz drakx-8d292ef16e45810732b28c37bc2d77aff110670b.tar.bz2 drakx-8d292ef16e45810732b28c37bc2d77aff110670b.tar.xz drakx-8d292ef16e45810732b28c37bc2d77aff110670b.zip | |
service_harddrake: handle adding/removing nokmsboot when switching the
driver.
Diffstat (limited to 'perl-install/standalone')
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 1b0f87065..6989ac24b 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.mdv$^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 { |