summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-25 20:14:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-25 20:14:12 +0000
commitdefc60bc4257601364a037c02057dadc6410a7dd (patch)
tree987c688d223fea2262e5676c514936b425793666
parentb0ef4f854e427c065abcc1e23f8da2143682fe6c (diff)
downloaddrakx-backup-do-not-use-defc60bc4257601364a037c02057dadc6410a7dd.tar
drakx-backup-do-not-use-defc60bc4257601364a037c02057dadc6410a7dd.tar.gz
drakx-backup-do-not-use-defc60bc4257601364a037c02057dadc6410a7dd.tar.bz2
drakx-backup-do-not-use-defc60bc4257601364a037c02057dadc6410a7dd.tar.xz
drakx-backup-do-not-use-defc60bc4257601364a037c02057dadc6410a7dd.zip
(suggest): add entry for nt
-rw-r--r--perl-install/bootloader.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index b2b91278e..fd0ef7f61 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -356,17 +356,18 @@ wait %d seconds for default boot.
}
} else {
#- search for dos (or windows) boot partition. Don't look in extended partitions!
- my ($dos, $win) = 0, 0;
+ my %nbs;
foreach (@$hds) {
foreach (@{$_->{primary}{normal}}) {
+ my $label = isNT($_) ? 'NT' : isDos($_) ? 'dos' : 'windows';
add_entry($lilo->{entries},
{
type => 'other',
kernel_or_dev => "/dev/$_->{device}",
- label => isDos($_) ? "dos" . ($dos++ ? $dos : '') : "windows" . ($win++ ? $win : '') ,
+ label => $label . ($nbs{$label}++ ? $nbs{$label} : ''),
table => "/dev/$_->{rootDevice}",
unsafe => 1
- }) if isFat($_) && isFat({ type => fsedit::typeOfPart($_->{device}) });
+ }) if isNT($_) || isFat($_) && isFat({ type => fsedit::typeOfPart($_->{device}) });
}
}
}