From 190429c5d57f5a6331461d521f454ec0046ad1ba Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 16 Oct 2009 16:18:09 +0000 Subject: service_harddrake: allow to force screen resolution using RESOLUTION_WANTED=XxY in /etc/sysconfig/harddrake2/service.conf --- perl-install/harddrake/autoconf.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'perl-install/harddrake') diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm index dadf133c7..ce22cd5ee 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, $o_skip_fb_setup) = @_; + my ($modules_conf, $o, $o_skip_fb_setup, $o_resolution_wanted) = @_; log::l('automatic XFree configuration'); @@ -12,8 +12,10 @@ sub xconf { my $do_pkgs = do_pkgs_standalone->new; $o->{raw_X} = Xconfig::default::configure($do_pkgs); + my $old_x = { if_($o_resolution_wanted, resolution_wanted => $o_resolution_wanted) }; + require Xconfig::main; - Xconfig::main::configure_everything_auto_install($o->{raw_X}, $do_pkgs, {}, { allowFB => listlength(cat_("/proc/fb")), skip_fb_setup => $o_skip_fb_setup }); + Xconfig::main::configure_everything_auto_install($o->{raw_X}, $do_pkgs, $old_x, { 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; -- cgit v1.2.1