summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-23 10:43:53 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-23 10:43:53 +0000
commitbda5afa37f77b4a69a7848bfa2a558f6027e5611 (patch)
treead23a9638ba791ec8d690dcffc2c46897e37838e /perl-install/Xconfigurator.pm
parentc15afb4a54dd6003ed89efaf6d42ef2db7eb887f (diff)
downloaddrakx-backup-do-not-use-bda5afa37f77b4a69a7848bfa2a558f6027e5611.tar
drakx-backup-do-not-use-bda5afa37f77b4a69a7848bfa2a558f6027e5611.tar.gz
drakx-backup-do-not-use-bda5afa37f77b4a69a7848bfa2a558f6027e5611.tar.bz2
drakx-backup-do-not-use-bda5afa37f77b4a69a7848bfa2a558f6027e5611.tar.xz
drakx-backup-do-not-use-bda5afa37f77b4a69a7848bfa2a558f6027e5611.zip
*** empty log message ***
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm10
1 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 0d46c73db..bf055b91c 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -151,6 +151,13 @@ sub cardConfigurationAuto() {
$card->{flags}{needVideoRam} &&= /86c368/;
push @{$card->{lines}}, @{$lines{$card->{identifier}} || []};
}
+ #- take a default on sparc if nothing has been found.
+ if (arch() =~ /^sparc/ && !$card->{server} && !$card->{type}) {
+ local $_ = cat_("/proc/fb");
+ if (/Mach64/) { $card->{server} = "Mach64" }
+ elsif (/Permedia2/) { $card->{server} = "3DLabs" }
+ else { $card->{server} = "Sun24" }
+ }
$card;
}
@@ -169,7 +176,8 @@ sub cardConfiguration(;$$$) {
add2hash($card, { vendor => "Unknown", board => "Unknown" });
$::xf4 = $card->{identifier} =~ /Rage 128/ if !$::expert;
- $card->{prog} = "/usr/X11R6/bin/" . ($::xf4 && $card->{driver} ? 'XFree86' : "XF86_$card->{server}");
+ $card->{prog} = "/usr/X11R6/bin/" . ($::xf4 && $card->{driver} ? 'XFree86' : $card->{server} =~ /Sun (.*)/x ?
+ "Xsun$1" : "XF86_$card->{server}");
-x "$prefix$card->{prog}" or $install && do {
$in->suspend;