From 51b0ae8285a511e53be6f27fbaff0825d8a1c8c2 Mon Sep 17 00:00:00 2001
From: Matthias Badaire <mbadaire@mandriva.com>
Date: Wed, 18 Jul 2001 14:54:31 +0000
Subject: IA64 adaptation

---
 perl-install/bootloader.pm  | 15 ++++++++-------
 perl-install/install_any.pm |  2 +-
 perl-install/modules.pm     |  3 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index c4e4acd9c..e7aec8add 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -613,8 +613,9 @@ sub install_lilo ($$) {
 	my ($file) = @_;
 	if (arch() =~ /ia64/) {
 	    (my $part, $file) = fsedit::file2part($prefix, $fstab, $file);
-	    my %hds = map_index { $_ => "hd$::i" } sort map { $_->{device} } @$hds;
-	    $hds->{$part->{device}} . ":" . $file;
+#	    my %hds = map_index { $_ => "hd$::i" } sort map { $_->{device} } @$hds;
+	    my %hds = map_index { $_ => "hd$::i" } sort map { $_->{device} } map { @{$_->{primary}{normal}}, map {$_->{normal} } @{$_->{extended} || []} } @$hds;
+	    %hds->{$part->{device}} . ":" . $file;
 	} else {
 	    $file
 	}
@@ -668,17 +669,17 @@ wait %d seconds for default boot.
 	    print F "disk=/dev/$dev bios=0x80";
 	}
 
-	print F "message=/boot/message";
-	print F "menu-scheme=wb:bw:wb:bw";
+	print F "message=/boot/message" if (arch() !~ /ia64/);
+	print F "menu-scheme=wb:bw:wb:bw" if (arch() !~ /ia64/);
 
 	foreach (@{$lilo->{entries}}) {
-	    print F "$_->{type}=$_->{kernel_or_dev}";
+	    print F "$_->{type}=", $file2fullname->($_->{kernel_or_dev});
 	    my $label = substr($_->{label}, 0, 15); #- lilo doesn't handle more than 15 char long labels
 	    $label =~ s/\s/_/g; #- lilo doesn't like spaces
 	    print F "\tlabel=$label"; 
 
 	    if ($_->{type} eq "image") {		
-		print F "\troot=", $file2fullname->($_->{root});
+		print F "\troot=$_->{root}";
 		print F "\tinitrd=", $file2fullname->($_->{initrd}) if $_->{initrd};
 		print F "\tappend=\"$_->{append}\"" if $_->{append};
 		print F "\tvga=$_->{vga}" if $_->{vga};
@@ -705,7 +706,7 @@ wait %d seconds for default boot.
 
     log::l("Installing boot loader...");
     $::testing and return;
-    run_program::rooted_or_die($prefix, "lilo", "2>", "/tmp/.error");
+    run_program::rooted_or_die($prefix, "lilo", "2>", "/tmp/.error") if (arch() !~ /ia64/);
     unlink "$prefix/tmp/.error";
 }
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 780227723..a8eb54f50 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -324,7 +324,7 @@ sub setPackages {
 
 	push @{$o->{default_packages}}, "nfs-utils-clients" if $o->{method} eq "nfs";
 	push @{$o->{default_packages}}, "numlock" if $o->{miscellaneous}{numlock};
-	push @{$o->{default_packages}}, "kernel-enterprise" if availableRamMB() > 800;
+	push @{$o->{default_packages}}, "kernel-enterprise" if (availableRamMB() > 800) && (arch() !~ /ia64/);
 	push @{$o->{default_packages}}, "kernel22" if c::kernel_version() =~ /^\Q2.2/;
 	push @{$o->{default_packages}}, "kernel22-secure" if $o->{security} > 3;
 	push @{$o->{default_packages}}, "kernel-smp" if detect_devices::hasSMP();
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 402c06402..a9dcd2218 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -426,7 +426,8 @@ my @skip_modules_on_stage1 = (
   "parport",
   "parport_pc",
   "plip",
-  qw(3w-xxxx pci2220i qla1280 qla2x00 i2o_block),
+  if_(arch() !~ /ia64/, qw(qla1280)),
+  qw(3w-xxxx pci2220i qla2x00 i2o_block),
   qw(gdth eata eata_pio eata_dma ips),
   qw(ac3200 at1700 atp ni5010 ni52 ni65),  #- unused from Jeff
   "u14-34f", #- duplicate from ultrastor.o
-- 
cgit v1.2.1