From 593e21a7ac60e7e88184aee132ca96abb6634883 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 17 Feb 2003 12:28:57 +0000
Subject: use fbdev when the graphic card is unknown

---
 perl-install/Xconfig/card.pm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'perl-install/Xconfig')

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);
-- 
cgit v1.2.1