diff options
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/harddrake/autoconf.pm | 6 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 50c18bcb1..4382ce7c0 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- service_harddrake: allow to force screen resolution using + RESOLUTION_WANTED=XxY in /etc/sysconfig/harddrake2/service.conf + Version 12.66 - 15 October 2009 - finish-install: do not offer to configure 3D desktop if none is 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; diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index a2d609117..6b1898b1e 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, {}, member($cfg{SETUP_FB}, qw(NO no))); + harddrake::autoconf::xconf($modules_conf, {}, member($cfg{SETUP_FB}, qw(NO no)), $cfg{RESOLUTION_WANTED}); next; } elsif ($Ident eq "MOUSE") { harddrake::autoconf::mouse_conf($modules_conf); |