summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-25 18:45:50 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-25 18:45:50 +0000
commit23c22ae05ec5203dcaf93ec4194b8ec2a5408f28 (patch)
treef69d71a154eaf6142790d1577ff873295e08e3d9 /perl-install/Xconfigurator.pm
parentcbcbc7ce4ce46ca523dd50da5da08a2cf3a06bce (diff)
downloaddrakx-backup-do-not-use-23c22ae05ec5203dcaf93ec4194b8ec2a5408f28.tar
drakx-backup-do-not-use-23c22ae05ec5203dcaf93ec4194b8ec2a5408f28.tar.gz
drakx-backup-do-not-use-23c22ae05ec5203dcaf93ec4194b8ec2a5408f28.tar.bz2
drakx-backup-do-not-use-23c22ae05ec5203dcaf93ec4194b8ec2a5408f28.tar.xz
drakx-backup-do-not-use-23c22ae05ec5203dcaf93ec4194b8ec2a5408f28.zip
*** empty log message ***
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm14
1 files changed, 11 insertions, 3 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index bf055b91c..19094c3b4 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -293,7 +293,7 @@ sub testFinalConfig($;$$) {
my $f = "/etc/X11/XF86Config.test";
write_XF86Config($o, $::testing ? $tmpconfig : "$prefix/$f");
- $skiptest || $o->{card}{server} eq 'FBDev' and return 1; #- avoid testing since untestable without reboot.
+ $skiptest || $o->{card}{server} =~ 'FBDev|Sun' and return 1; #- avoid testing with these.
#- needed for bad cards not restoring cleanly framebuffer
my $bad_card = $o->{card}{identifier} =~ /i740|ViRGE/;
@@ -423,8 +423,11 @@ sub autoDefaultDepth($$) {
return 24 if $card->{identifier} =~ /SiS/;
- if ($card->{server} eq 'FBDev') {
- return 16; #- this should work by default, FBDev is allowed only if install currently uses it at 16bpp.
+ for ($card->{server}) {
+ /FBDev/ and return 16; #- this should work by default, FBDev is allowed only if install currently uses it at 16bpp.
+ /Sun24/ and return 24;
+ /SunMono/ and return 2;
+ /Sun/ and return 8;
}
while (my ($d, $r) = each %{$card->{depth}}) {
@@ -531,6 +534,11 @@ sub resolutionsConfiguration($%) {
if (member($card->{server}, "Mono", "VGA16")) {
$card->{depth}{8} = [[ 640, 480 ]];
return;
+ } elsif ($card->{server} =~ /Sun/) {
+ $card->{depth}{2} = [[ 1152, 864 ]] if $card->{server} eq "SunMono";
+ $card->{depth}{8} = [[ 1152, 864 ]] if $card->{server} eq "Sun";
+ $card->{depth}{24} = [[ 1152, 864 ]] if $card->{server} eq "Sun24";
+ return;
}
#- some of these guys hate to be poked