summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-09-14 15:59:23 +0000
committerOlivier Blin <oblin@mandriva.com>2009-09-14 15:59:23 +0000
commit855594439dae0c0d50fd11c2b790e672bfc791ea (patch)
tree35365af2d7fa5bec0431c4f48fe951cba13bda60
parent4062da0581a429546f68ee1d560d1862827f3d11 (diff)
downloaddrakx-855594439dae0c0d50fd11c2b790e672bfc791ea.tar
drakx-855594439dae0c0d50fd11c2b790e672bfc791ea.tar.gz
drakx-855594439dae0c0d50fd11c2b790e672bfc791ea.tar.bz2
drakx-855594439dae0c0d50fd11c2b790e672bfc791ea.tar.xz
drakx-855594439dae0c0d50fd11c2b790e672bfc791ea.zip
harddrake: allow to skip XFdrake framebuffer setup (and thus splash removal) if SETUP_FB is set to "no" in /etc/sysconfig/harddrake2/service.conf
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/harddrake/autoconf.pm4
-rwxr-xr-xperl-install/standalone/service_harddrake2
3 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e893c2efb..1a133ec77 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -5,6 +5,10 @@
- fix parsing dmidecode output (broken since we use dmidecode-2.10,
aka since November 24 2008)
- ide-disk module is now named ide-gd_mod
+- harddrake:
+ 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.74.1)
Version 12.32 - 23 April 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);