From 277e64ea8925b628addad26086769a1d85a9927c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 7 Sep 2007 13:18:04 +0000
Subject: - do not configure "windows" bootloader entries for "hidden"
 partitions

---
 perl-install/bootloader.pm | 4 +++-
 perl-install/fs/type.pm    | 6 +++---
 perl-install/install/NEWS  | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 302544acb..0976f1678 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -978,7 +978,9 @@ sub suggest {
     } elsif (arch() !~ /ia64/) {
 	#- search for dos (or windows) boot partition. Do not look in extended partitions!
 	my @windows_boot_parts =
-	  grep { isFat_or_NTFS($_) && member(fs::type::fs_type_from_magic($_), 'vfat', 'ntfs') }
+	  grep { isFat_or_NTFS($_) && member(fs::type::fs_type_from_magic($_), 'vfat', 'ntfs')
+		   && fs::type::part2type_name($_) !~ /^Hidden/;
+	     }
 	    map { @{$_->{primary}{normal}} } @{$all_hds->{hds}};
 	each_index {
 	    add_entry($bootloader,
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 40e3db41e..71995af77 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -87,9 +87,9 @@ if_(arch() =~ /ppc/,
   0x16 => '',         'Hidden FAT16',
   0x17 => 'ntfs',     'Hidden HPFS/NTFS',
   0x18 => '',         'AST SmartSleep',
-  0x1b => 'vfat',     'Hidden W95 FAT32',
-  0x1c => 'vfat',     'Hidden W95 FAT32 (LBA)',
-  0x1e => 'vfat',     'Hidden W95 FAT16 (LBA)',
+  0x1b => 'vfat',     'Hidden W95 FAT32',       # \ 
+  0x1c => 'vfat',     'Hidden W95 FAT32 (LBA)', #  > don't change label, it's used to know if it's not a boot partition in bootloader.pm
+  0x1e => 'vfat',     'Hidden W95 FAT16 (LBA)', # /
   0x24 => '',         'NEC DOS',
   0x39 => '',         'Plan 9',
   0x3c => '',         'PartitionMagic recovery',
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index ec61e66b3..2c145b928 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- do not configure "windows" bootloader entries for "hidden" partitions
 - fix unwrapped label (#33243)
 
 Version 10.4.191 - 5 September 2007, by Thierry Vignaud
-- 
cgit v1.2.1