summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2001-09-26 08:27:02 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2001-09-26 08:27:02 +0000
commitd26d0048f47da4e59c8382af1a20b1537fc7dd43 (patch)
tree03998a5acedd31927a5f5cc2ebed1ffe6a40144b
parent6b311aa6e6983fc663d95ed1189e75a7362df55b (diff)
downloaddrakx-d26d0048f47da4e59c8382af1a20b1537fc7dd43.tar
drakx-d26d0048f47da4e59c8382af1a20b1537fc7dd43.tar.gz
drakx-d26d0048f47da4e59c8382af1a20b1537fc7dd43.tar.bz2
drakx-d26d0048f47da4e59c8382af1a20b1537fc7dd43.tar.xz
drakx-d26d0048f47da4e59c8382af1a20b1537fc7dd43.zip
- bootloader.pm (suggest): don't search for dos (or windows) boot partition
on IA-64 since ELILO can only boot Linux. - bootloader.pm (write_lilo_conf): don't cry if we don't have /boot/boot.b or boot/message on IA-64.
-rw-r--r--perl-install/bootloader.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index a11d13ace..c2a75e8dc 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -368,7 +368,7 @@ wait %d seconds for default boot.
kernel_or_dev => $partition_table_mac'macos_part
});
}
- } else {
+ } elsif (arch() !~ /ia64/) {
#- search for dos (or windows) boot partition. Don't look in extended partitions!
my %nbs;
foreach (@$hds) {
@@ -649,7 +649,9 @@ sub write_lilo_conf {
last;
}
}
- -e "$prefix/boot/boot.b" && -e "$prefix/boot/message" or die "unable to get right lilo configuration in $prefix/boot";
+ if (arch() !~ /ia64/) {
+ -e "$prefix/boot/boot.b" && -e "$prefix/boot/message" or die "unable to get right lilo configuration in $prefix/boot";
+ }
{
local *F;