summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-29 17:16:56 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-29 17:16:56 +0000
commitd72ffade4e086fa3eb0f7904a4141dea3ad91705 (patch)
treebdbc9fce22747c2a19f980b087c2b5f0a3ae3618 /perl-install/Xconfigurator.pm
parent436a081d985d376060908b1db436a6ad2691d593 (diff)
downloaddrakx-backup-do-not-use-d72ffade4e086fa3eb0f7904a4141dea3ad91705.tar
drakx-backup-do-not-use-d72ffade4e086fa3eb0f7904a4141dea3ad91705.tar.gz
drakx-backup-do-not-use-d72ffade4e086fa3eb0f7904a4141dea3ad91705.tar.bz2
drakx-backup-do-not-use-d72ffade4e086fa3eb0f7904a4141dea3ad91705.tar.xz
drakx-backup-do-not-use-d72ffade4e086fa3eb0f7904a4141dea3ad91705.zip
*** empty log message ***
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 19094c3b4..0a312f8eb 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -138,12 +138,11 @@ sub keepOnlyLegalModes {
} @$res;
delete $card->{depth}{$depth} if @$res == 0;
}
-
}
sub cardConfigurationAuto() {
my $card;
- if (my (@c) = pci_probing::main::probe("DISPLAY")) {
+ if (my (@c) = (pci_probing::main::probe("DISPLAY"), sbus_probing::main::probe("DISPLAY"))) {
local $_;
($card->{identifier}, $_) = @{$c[-1]};
$card->{type} = $1 if /Card:(.*)/;
@@ -153,6 +152,7 @@ sub cardConfigurationAuto() {
}
#- take a default on sparc if nothing has been found.
if (arch() =~ /^sparc/ && !$card->{server} && !$card->{type}) {
+ log::l("Using probe with /proc/fb as nothing has been found!");
local $_ = cat_("/proc/fb");
if (/Mach64/) { $card->{server} = "Mach64" }
elsif (/Permedia2/) { $card->{server} = "3DLabs" }