From a1050ac09384f5a0ce47abc3223df84094436ed8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 5 Sep 2002 17:49:21 +0000
Subject: do not add an nt label if there is no magic

---
 perl-install/bootloader.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install/bootloader.pm')

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);
 	    }
 	}
     }
-- 
cgit v1.2.1