summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-04-15 17:18:22 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-04-15 17:18:22 +0000
commitdef65890962642ded5d4a45c0c3eef8379c80a29 (patch)
tree4d1b273955db016f8b70a332871f8a8f1427fdb0
parentf3389a276297e29d8d6595073436692e45cb0939 (diff)
downloaddrakx-def65890962642ded5d4a45c0c3eef8379c80a29.tar
drakx-def65890962642ded5d4a45c0c3eef8379c80a29.tar.gz
drakx-def65890962642ded5d4a45c0c3eef8379c80a29.tar.bz2
drakx-def65890962642ded5d4a45c0c3eef8379c80a29.tar.xz
drakx-def65890962642ded5d4a45c0c3eef8379c80a29.zip
windows boot partition is the active one (#49483)
-rw-r--r--perl-install/bootloader.pm8
-rw-r--r--perl-install/install/NEWS2
2 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index b6dcb9770..cbdd7be3e 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1065,13 +1065,7 @@ sub suggest {
} elsif (arch() !~ /ia64/) {
#- search for dos (or windows) boot partition. Do not look in extended partitions!
my @windows_boot_parts =
- grep {
- my $handle = any::inspect($_, $::prefix);
- my $dir = $handle && $handle->{dir};
- my @root_files = map { lc($_) } all($dir);
- log::l("found the following files on potential windows partition $_->{device}: " . join(' ', @root_files));
- intersection(\@root_files, [ "windows", "winnt" ]);
- }
+ grep { $_->{active} }
grep { isFat_or_NTFS($_) && member(fs::type::fs_type_from_magic($_), 'vfat', 'ntfs', 'ntfs-3g')
&& fs::type::part2type_name($_) !~ /^Hidden/;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 38b184052..1448db764 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- windows boot partition is the active one (#49483)
+
Version 12.28 - 15 April 2009
- include mount.ntfs-3g in install