summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-09-14 16:08:07 +0000
committerOlivier Blin <oblin@mandriva.com>2009-09-14 16:08:07 +0000
commit58311267bdf940bd39cd334e0b45cfc24d87d8d3 (patch)
treea35f5bfa83282ffa1cb40825422f452d54fd92c8 /lib
parent6bf0d7b2c99cbd9fcde479ee07065d3cddf83c35 (diff)
downloaddrakx-kbd-mouse-x11-58311267bdf940bd39cd334e0b45cfc24d87d8d3.tar
drakx-kbd-mouse-x11-58311267bdf940bd39cd334e0b45cfc24d87d8d3.tar.gz
drakx-kbd-mouse-x11-58311267bdf940bd39cd334e0b45cfc24d87d8d3.tar.bz2
drakx-kbd-mouse-x11-58311267bdf940bd39cd334e0b45cfc24d87d8d3.tar.xz
drakx-kbd-mouse-x11-58311267bdf940bd39cd334e0b45cfc24d87d8d3.zip
allow to skip framebuffer setup (and thus splash removal) for newer harddrake releases
Diffstat (limited to 'lib')
-rw-r--r--lib/Xconfig/main.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Xconfig/main.pm b/lib/Xconfig/main.pm
index 94ff9be..f94e3c6 100644
--- a/lib/Xconfig/main.pm
+++ b/lib/Xconfig/main.pm
@@ -54,7 +54,7 @@ sub configure_everything_auto_install {
Xconfig::screen::configure($raw_X) or return;
$X->{resolutions} = Xconfig::resolution_and_depth::configure_auto_install($raw_X, $X->{card}, $X->{monitors}, $old_X);
- my $action = &write($raw_X, $X);
+ my $action = &write($raw_X, $X, $options->{skip_fb_setup});
$action;
}
@@ -203,13 +203,13 @@ The current configuration is:
}
sub write {
- my ($raw_X, $X) = @_;
+ my ($raw_X, $X, $o_skip_fb_setup) = @_;
export_to_install_X($X) if $::isInstall;
my $only_resolution = $raw_X->is_only_resolution_modified;
$raw_X->write;
Xconfig::various::check_xorg_conf_symlink();
if ($X->{resolutions}[0]{bios}) {
- Xconfig::various::setupFB($X->{resolutions}[0]{bios});
+ Xconfig::various::setupFB($X->{resolutions}[0]{bios}) if !$o_skip_fb_setup;;
'need_reboot';
} elsif (my $resolution = $only_resolution && eval { $raw_X->get_resolution }) {
'need_xrandr' . sprintf(' --size %dx%d', @$resolution{'X', 'Y'});