diff options
author | Olivier Blin <blino@mageia.org> | 2011-04-23 00:21:48 +0000 |
---|---|---|
committer | Olivier Blin <blino@mageia.org> | 2011-04-23 00:21:48 +0000 |
commit | 39523edb7f886cbd5fc14a6ee27e421a4495b544 (patch) | |
tree | 48fb16a0c02d93c3d72dfdb97ef03f7b8477d890 /lib/Xconfig | |
parent | a76b71697189e08cbadcfa9d9e72f2175a32be92 (diff) | |
download | drakx-kbd-mouse-x11-39523edb7f886cbd5fc14a6ee27e421a4495b544.tar drakx-kbd-mouse-x11-39523edb7f886cbd5fc14a6ee27e421a4495b544.tar.gz drakx-kbd-mouse-x11-39523edb7f886cbd5fc14a6ee27e421a4495b544.tar.bz2 drakx-kbd-mouse-x11-39523edb7f886cbd5fc14a6ee27e421a4495b544.tar.xz drakx-kbd-mouse-x11-39523edb7f886cbd5fc14a6ee27e421a4495b544.zip |
- harddrake: configure default resolution (and background) even if card
configuration fails (useful if vbox video driver is not available)
Diffstat (limited to 'lib/Xconfig')
-rw-r--r-- | lib/Xconfig/main.pm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/Xconfig/main.pm b/lib/Xconfig/main.pm index 1ba965d..0a63a54 100644 --- a/lib/Xconfig/main.pm +++ b/lib/Xconfig/main.pm @@ -50,9 +50,13 @@ sub configure_everything_auto_install { my $X = {}; $X->{monitors} = Xconfig::monitor::configure_auto_install($raw_X, $old_X) or return; $options->{VideoRam_probed} = $X->{monitors}[0]{VideoRam_probed}; - $X->{card} = Xconfig::card::configure_auto_install($raw_X, $do_pkgs, $old_X, $options) or return; - Xconfig::screen::configure($raw_X) or return; - $X->{resolutions} = Xconfig::resolution_and_depth::configure_auto_install($raw_X, $X->{card}, $X->{monitors}, $old_X); + $X->{card} = Xconfig::card::configure_auto_install($raw_X, $do_pkgs, $old_X, $options); + my $configured = $X->{card} && Xconfig::screen::configure($raw_X); + + #- still try to configure screen and resolution (to set default background) + #- if card configuration failed (for example if best driver is not available) + $X->{resolutions} = Xconfig::resolution_and_depth::configure_auto_install($raw_X, $X->{card} ||{}, $X->{monitors}, $old_X); + return if !$configured; my $action = &write($raw_X, $X, $options->{skip_fb_setup}); |