From 4fb43c75a5963465bab3870404ff75d1eecc9c37 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 24 Mar 2004 15:47:25 +0000
Subject: - preferring "p3-smp-64GB" first (for BIGMEM + SMP) - also adding
 i686-up-4GB - cleanup code

---
 perl-install/bootloader.pm | 9 ++++-----
 1 file 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));
-- 
cgit v1.2.1