From 58311267bdf940bd39cd334e0b45cfc24d87d8d3 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Mon, 14 Sep 2009 16:08:07 +0000
Subject: allow to skip framebuffer setup (and thus splash removal) for newer
 harddrake releases

---
 lib/Xconfig/main.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/Xconfig/main.pm')

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'});
-- 
cgit v1.2.1