harddrake: allow to skip XFdrake framebuffer setup (and thus splash removal) if SETUP_FB is set to "no" in /etc/sysconfig/harddrake2/service.conf

3 files changed, 6 insertions, 3 deletions

diff --git a/perl-install/NEWS b/perl-install/NEWS
index cfc8da2eb..2bc66bcac 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,9 @@
   o new small webkit based browser for rendering help and for FTW
 - harddrake:
   o fix detecting  some memory card readers as unknown
+  o allow to skip XFdrake framebuffer setup (and thus splash removal)
+    if SETUP_FB is set to "no" in /etc/sysconfig/harddrake2/service.conf
+    (requires drakx-kbd-mouse-x11 >= 0.79)
 
 Version 12.49 - 8 September 2009
 
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index f59281b55..dadf133c7 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -3,7 +3,7 @@ package harddrake::autoconf;
 use common;
 
 sub xconf {
-    my ($modules_conf, $o) = @_;
+    my ($modules_conf, $o, $o_skip_fb_setup) = @_;
 
     log::l('automatic XFree configuration');
     
@@ -13,7 +13,7 @@ sub xconf {
     $o->{raw_X} = Xconfig::default::configure($do_pkgs);
     
     require Xconfig::main;
-    Xconfig::main::configure_everything_auto_install($o->{raw_X}, $do_pkgs, {}, { allowFB => listlength(cat_("/proc/fb")) });
+    Xconfig::main::configure_everything_auto_install($o->{raw_X}, $do_pkgs, {}, { allowFB => listlength(cat_("/proc/fb")), skip_fb_setup => $o_skip_fb_setup });
 
     #- always disable compositing desktop effects when configuring a new video card
     require Xconfig::glx;
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index c2705d042..a2d609117 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -201,7 +201,7 @@ foreach my $hw_class (@harddrake::data::tree) {
         $modules_conf->write;
     } elsif ($Ident eq "VIDEO") {
         # explicitely NOT read the existing config (eg: new profile with globetrotter)
-        harddrake::autoconf::xconf($modules_conf, {});
+        harddrake::autoconf::xconf($modules_conf, {}, member($cfg{SETUP_FB}, qw(NO no)));
         next;
     } elsif ($Ident eq "MOUSE") {
         harddrake::autoconf::mouse_conf($modules_conf);