summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-03-24 15:47:25 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-03-24 15:47:25 +0000
commit4fb43c75a5963465bab3870404ff75d1eecc9c37 (patch)
treeb239668f637963758a0e142f1220b6a5d70b631f /perl-install
parentf1cf637d858ec3c0039aaac3f8fc377ffa26b768 (diff)
downloaddrakx-backup-do-not-use-4fb43c75a5963465bab3870404ff75d1eecc9c37.tar
drakx-backup-do-not-use-4fb43c75a5963465bab3870404ff75d1eecc9c37.tar.gz
drakx-backup-do-not-use-4fb43c75a5963465bab3870404ff75d1eecc9c37.tar.bz2
drakx-backup-do-not-use-4fb43c75a5963465bab3870404ff75d1eecc9c37.tar.xz
drakx-backup-do-not-use-4fb43c75a5963465bab3870404ff75d1eecc9c37.zip
- preferring "p3-smp-64GB" first (for BIGMEM + SMP)
- also adding i686-up-4GB - cleanup code
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 6e08d3824..5f5d4384f 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -643,11 +643,10 @@ wait for default boot.
}
}
}
- foreach ('secure', 'enterprise', 'smp') {
- if (get_label("linux-$_", $bootloader)) {
- $bootloader->{default} ||= "linux-$_";
- last;
- }
+
+ my @preferred = map { "linux-$_" } 'p3-smp-64GB', 'secure', 'enterprise', 'smp', 'i686-up-4GB';
+ if (my $preferred = find { get_label($_, $bootloader) } @preferred) {
+ $bootloader->{default} ||= $preferred;
}
$bootloader->{default} ||= "linux";
$bootloader->{method} ||= first(method_choices($fstab, $bootloader));