diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-09-05 17:49:21 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-09-05 17:49:21 +0000 |
| commit | a1050ac09384f5a0ce47abc3223df84094436ed8 (patch) | |
| tree | 574268aaf0c2bf496b95e1cd0927efa716a97282 | |
| parent | 234c8d70cf522366d88a69dcf6da289c006976b6 (diff) | |
| download | drakx-a1050ac09384f5a0ce47abc3223df84094436ed8.tar drakx-a1050ac09384f5a0ce47abc3223df84094436ed8.tar.gz drakx-a1050ac09384f5a0ce47abc3223df84094436ed8.tar.bz2 drakx-a1050ac09384f5a0ce47abc3223df84094436ed8.tar.xz drakx-a1050ac09384f5a0ce47abc3223df84094436ed8.zip | |
do not add an nt label if there is no magic
| -rw-r--r-- | perl-install/bootloader.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 0b41bd5b9..48c905420 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -196,7 +196,7 @@ sub add_kernel { symlinkf("initrd-$version.img", "$::prefix$initrd") or cp_af("$::prefix/boot/initrd-$version.img", "$::prefix$initrd"); } - my $label = $ext =~ /-(default)/ ? $1 : $ext =~ /\d\./ ? sanitize_ver("linux$ext") : "linux$ext"; + my $label = $ext =~ /-(default)/ ? $1 : ($ext =~ /\d\./ ? sanitize_ver("linux$ext") : "linux$ext"); #- more yaboot concessions - PPC if (arch() =~ /ppc/) { @@ -489,6 +489,7 @@ wait %d seconds for default boot. my %nbs; foreach (@$hds) { foreach (@{$_->{primary}{normal}}) { + my $from_magic = { type => fsedit::typeOfPart($_->{device}) }; my $label = isNT($_) ? 'NT' : isDos($_) ? 'dos' : 'windows'; add_entry($lilo, { @@ -499,7 +500,7 @@ wait %d seconds for default boot. table => "/dev/$_->{rootDevice}" ), unsafe => 1 - }) if isNT($_) || isFat($_) && isFat({ type => fsedit::typeOfPart($_->{device}) }); + }) if isNT($from_magic) || isFat($from_magic); } } } |