summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-01-25 13:39:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-01-25 13:39:12 +0000
commite588c96c621b8b3d42ded8301d4d551714d20032 (patch)
tree322333c1ec7eb63aaf566905f7cb3f4d69648d23
parentaf9849216446ffb700a55cca70b9b515764dea66 (diff)
downloaddrakx-backup-do-not-use-e588c96c621b8b3d42ded8301d4d551714d20032.tar
drakx-backup-do-not-use-e588c96c621b8b3d42ded8301d4d551714d20032.tar.gz
drakx-backup-do-not-use-e588c96c621b8b3d42ded8301d4d551714d20032.tar.bz2
drakx-backup-do-not-use-e588c96c621b8b3d42ded8301d4d551714d20032.tar.xz
drakx-backup-do-not-use-e588c96c621b8b3d42ded8301d4d551714d20032.zip
prefer default linux-{smp,enterprise,secure} over simple linux
-rw-r--r--perl-install/bootloader.pm11
1 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 933251fd9..bd5de01b7 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -288,7 +288,6 @@ sub suggest {
my ($onmbr, $unsafe) = $lilo->{crushMbr} ? (1, 0) : suggest_onmbr($hds);
add2hash_($lilo, arch() =~ /sparc/ ?
{
- default => "linux",
entries => [],
timeout => 5,
use_partition => 0, #- we should almost always have a whole disk partition.
@@ -298,7 +297,6 @@ sub suggest {
} : arch =~ /ppc/ ?
{
defaultos => "linux",
- default => "linux",
entries => [],
initmsg => "Welcome to Mandrake Linux!",
delay => 30, #- OpenFirmware delay
@@ -310,7 +308,6 @@ sub suggest {
} :
{
bootUnsafe => $unsafe,
- default => "linux",
entries => [],
timeout => $onmbr && 5,
if_(arch() !~ /ia64/,
@@ -406,6 +403,14 @@ wait %d seconds for default boot.
}
}
}
+ foreach ('secure', 'enterprise', 'smp') {
+ if (get_label("linux-$_", $lilo)) {
+ $lilo->{default} ||= "linux-$_";
+ last;
+ }
+ }
+ $lilo->{default} ||= "linux";
+
my %l = (
yaboot => to_bool(arch() =~ /ppc/),
silo => to_bool(arch() =~ /sparc/),