summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/Xconfig')
-rw-r--r--perl-install/Xconfig/card.pm14
1 files changed, 9 insertions, 5 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 4195c325d..709283e2a 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -276,16 +276,20 @@ sub configure {
my @cards = probe();
@cards or @cards = {};
- if ($auto) {
- return 0 if !$cards[0]{server} && !$cards[0]{Driver};
- } else {
+ if (!$cards[0]{server} && !$cards[0]{Driver}) {
+ if ($options->{allowFB}) {
+ $cards[0]{Driver} = 'fbdev';
+ } elsif ($auto) {
+ log::l("Xconfig::card: auto failed (unknown card and no allowFB)");
+ return 0;
+ }
+ }
+ if (!$auto) {
card_config__not_listed($in, $cards[0], $options) or return;
}
my $card = multi_head_choose($in, $auto, @cards) or return;
- $card->{Driver} = 'fbdev' if $options->{allowFB} && !$card->{server} && !$card->{Driver};
-
xfree_and_glx_choose($in, $card, $auto) or return;
$card->{prog} = install_server($card, $options, $do_pkgs);