summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-22 09:05:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-22 09:05:27 +0000
commit179fde5301ee0bd5dd05f16a5e9054de5acb7878 (patch)
tree40fb4907dfc8353e2ee11085eb9ed5d2b14d91c0 /perl-install
parent00c5061cc52c956258b1d16eec34a53280ed0d5b (diff)
downloaddrakx-179fde5301ee0bd5dd05f16a5e9054de5acb7878.tar
drakx-179fde5301ee0bd5dd05f16a5e9054de5acb7878.tar.gz
drakx-179fde5301ee0bd5dd05f16a5e9054de5acb7878.tar.bz2
drakx-179fde5301ee0bd5dd05f16a5e9054de5acb7878.tar.xz
drakx-179fde5301ee0bd5dd05f16a5e9054de5acb7878.zip
- do not put "windows" entry in bootloader for partitions where Windows is not
present (#8086)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm7
-rw-r--r--perl-install/install/NEWS2
2 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 2d182e3bb..f8b304651 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -996,6 +996,13 @@ 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 { isFat_or_NTFS($_) && member(fs::type::fs_type_from_magic($_), 'vfat', 'ntfs')
&& fs::type::part2type_name($_) !~ /^Hidden/;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 2d024fa3d..eb78dbb69 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
- adapt to perl 5.10.0
- create /dev/cdrom symlink for installer (#36703)
+- do not put "windows" entry in bootloader for partitions where Windows is not
+ present (#8086)
Version 10.6.5 - 14 January 2008