summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-11-25 17:39:03 +0000
committerOlivier Blin <oblin@mandriva.com>2009-11-25 17:39:03 +0000
commitb45350d4101df344ae530c1ddacb0f3d20eea0e1 (patch)
tree05c971e871e300d028b41c21b1b8322c16928f75
parent3c750d77a95e0f03e17c5f6835660af147811bc4 (diff)
downloaddrakx-b45350d4101df344ae530c1ddacb0f3d20eea0e1.tar
drakx-b45350d4101df344ae530c1ddacb0f3d20eea0e1.tar.gz
drakx-b45350d4101df344ae530c1ddacb0f3d20eea0e1.tar.bz2
drakx-b45350d4101df344ae530c1ddacb0f3d20eea0e1.tar.xz
drakx-b45350d4101df344ae530c1ddacb0f3d20eea0e1.zip
do not add removable drives as "Windows" entry in bootloader
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm1
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 8cf35630b..1adb23681 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -9,6 +9,8 @@
- harddrake:
o do not display bogus "0" ids for hard disks
o fix detecting some mice
+- bootloader:
+ o do not add removable drives as "Windows" entry in bootloader
Version 12.78 - 18 November 2009
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index fabd82a8f..8a5bcaba4 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1075,6 +1075,7 @@ sub suggest {
my @windows_boot_parts =
grep { $_->{active}
&& isFat_or_NTFS($_) && member(fs::type::fs_type_from_magic($_), 'vfat', 'ntfs', 'ntfs-3g')
+ && !$_->{is_removable}
&& !isRecovery($_);
}
map { @{$_->{primary}{normal}} } @{$all_hds->{hds}};
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index df4dcce44..42cf8ed51 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -11,6 +11,8 @@
(breaks install if the Win partition is the installer media)
- do not stay chdired in /mnt/var/cache/urpmi when download fails
(workaround urpmi bug)
+- bootloader:
+ o do not add removable drives as "Windows" entry in bootloader
Version 12.77 - 30 October 2009