diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-03-28 02:18:30 +0100 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-03-30 15:01:09 +0259 |
| commit | 6da0111e315928dd9d42494ea3c0d5c208a1f411 (patch) | |
| tree | a47378d72cad46ebfeb15c3506040f929844c4fc | |
| parent | 0bc75bac4fd3c0599f05f556326dfd84ee39c842 (diff) | |
| download | drakx-6da0111e315928dd9d42494ea3c0d5c208a1f411.tar drakx-6da0111e315928dd9d42494ea3c0d5c208a1f411.tar.gz drakx-6da0111e315928dd9d42494ea3c0d5c208a1f411.tar.bz2 drakx-6da0111e315928dd9d42494ea3c0d5c208a1f411.tar.xz drakx-6da0111e315928dd9d42494ea3c0d5c208a1f411.zip | |
(isRecovery) move "Compaq diagnostics" test here
(needed for next commit)
should have been done in commit 4b06a8a57d52b7d5447a1b487b8d33e36b4121b7
added in commit c2ef4a362e13249d8a774c7c5b7d0a8ab5df7d11
| -rw-r--r-- | perl-install/fs/mount_point.pm | 2 | ||||
| -rw-r--r-- | perl-install/fs/type.pm | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm index 1edcacb7a..9c6996dc3 100644 --- a/perl-install/fs/mount_point.pm +++ b/perl-install/fs/mount_point.pm @@ -62,7 +62,7 @@ sub suggest_mount_points_always { if (@ESP) { $ESP[0]{mntpoint} = "/boot/EFI"; } - my @win = grep { isFat_or_NTFS($_) && !$_->{isMounted} && maybeFormatted($_) && !$_->{is_removable} && $_->{pt_type} != 0x12 && !isRecovery($_) } @$fstab; + my @win = grep { isFat_or_NTFS($_) && !$_->{isMounted} && maybeFormatted($_) && !$_->{is_removable} && !isRecovery($_) } @$fstab; log::l("win parts: ", join ",", map { $_->{device} } @win) if @win; if (@win == 1) { $win[0]{mntpoint} = "/media/windows"; diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index 5b9cc8804..264b89964 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -303,6 +303,7 @@ sub isApple { $_[0]{pt_type} == 0x401 && defined $_[0]{isDriver} } sub isAppleBootstrap { $_[0]{pt_type} == 0x401 && defined $_[0]{isBoot} } sub isRecovery { isFat_or_NTFS($_[0]) && ($_[0]{type_name} =~ /^Hidden/ || + $_->{pt_type} == 0x12 || # "Compaq diagnostics" member($_[0]{device_LABEL} , # Extracted from /usr/share/hal/fdi/policy/10osvendor/20-storage-methods.fdi # Hopefuly we'll ask to hal/udev someday |