From 23c22ae05ec5203dcaf93ec4194b8ec2a5408f28 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 25 May 2000 18:45:50 +0000
Subject: *** empty log message ***

---
 perl-install/ChangeLog                    |  3 +++
 perl-install/Xconfigurator.pm             | 14 +++++++++++---
 perl-install/install_steps.pm             | 14 ++++++++++++--
 perl-install/install_steps_interactive.pm |  2 +-
 tools/gencompss                           |  4 ++--
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index f7f427140..6472ee407 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -10,12 +10,15 @@
 	* commands.pm: fixed insmod command to take modules64.cz* on sparc*
 	* install2.pm: removed create boot disk and create auto install disk on
 	sparc*. force writing of /etc/conf.modules for step setupBootloader.
+	* install_steps.pm: fixed upgrade for sparc* and disable supermount for sparc*.
 	* install_steps_interactive.pm: added missing $prefix for glob_. call
 	configure_entry in setupSILO. fixed cancel or None entry on setupBootloader.
 	* modules.pm: updated alias for sparc*.
 	* any.pm: fixed proprable wrong test for setupBootloader in beginner at
 	the very beginning.
 	* printer.pm: fixed typo.
+	* Xconfigurator.pm: avoid testing if using a Sun* server, added depth and
+	resolution for these server too.
 
 2000-05-24  François Pons  <fpons@mandrakesoft.com>
 
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
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 9020b47ab..8c4d5d2d2 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -782,7 +782,17 @@ sub readBootloaderConfigBeforeInstall {
 	if (my $v = readlink "$o->{prefix}/boot/$image") {
 	    $v = "/boot/$v" if $v !~ m|^/|;
 	    if (-e "$o->{prefix}$v") {
-		my $e = lilo::get("/boot/$image", $o->{bootloader}) or next;
+		my $e;
+
+		if (arch() =~ /sparc/) {
+		    require silo;
+		    $e = silo::get("/boot/$image", $o->{bootloader});
+		} else {
+		    require lilo;
+		    $e = lilo::get("/boot/$image", $o->{bootloader});
+		}
+
+		$e or next;
 		$e->{kernel_or_dev} = $v;
 		log::l("renaming /boot/$image entry by $v");
 	    }
@@ -912,7 +922,7 @@ sub miscellaneous {
     $o->{security} ||= $s{SECURITY} if exists $s{SECURITY};
 
     $ENV{SECURE_LEVEL} = $o->{security};
-    add2hash_ $o, { useSupermount => $o->{security} < 4 && $o->{installClass} !~ /corporate|server/ };
+    add2hash_ $o, { useSupermount => $o->{security} < 4 && arch() !~ /sparc/ && $o->{installClass} !~ /corporate|server/ };
 
     cat_("/proc/cmdline") =~ /mem=(\S+)/;
     add2hash_($o->{miscellaneous} ||= {}, { numlock => !$o->{pcmcia}, $1 ? (memsize => $1) : () });
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 088baa492..daae89ed9 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -960,7 +960,7 @@ sub miscellaneous {
     exists $u->{LAPTOP} or $u->{LAPTOP} = 1;
     my $s = $o->{security};
 
-    add2hash_ $o, { useSupermount => $s < 4 && arch() =~ /^sparc/ };
+    add2hash_ $o, { useSupermount => $s < 4 && arch() !~ /^sparc/ };
     $s = $l{$s} || $s;
 
     !$::beginner || $clicked and $o->ask_from_entries_refH('',
diff --git a/tools/gencompss b/tools/gencompss
index b26ef7c2c..333d02f0c 100755
--- a/tools/gencompss
+++ b/tools/gencompss
@@ -4,11 +4,11 @@ open F, "bzip2 -dc @ARGV 2>/dev/null | hdlist2groups - |";
 foreach (<F>) {
     chop;
     /(.*):(.*)/;
-    push @{$l{$2}}, $1;
+    $l{$2}{$1} = undef;
 }
 close F or die;
 foreach (sort keys %l) {
     print "$_\n";
-    print "\t$_\n" foreach sort @{$l{$_}};
+    print "\t$_\n" foreach sort keys %{$l{$_}};
     print "\n";
 }
-- 
cgit v1.2.1