summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-10 03:28:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-10 03:28:41 +0000
commitf1b239a95402398b493fbda637c97c9997561ee7 (patch)
tree2e2f445115a16f0d62e6a097c83deceab27bc7ac
parent75c1631b54a9b4ffafa30b6d60e4e0eec7a43214 (diff)
downloaddrakx-backup-do-not-use-f1b239a95402398b493fbda637c97c9997561ee7.tar
drakx-backup-do-not-use-f1b239a95402398b493fbda637c97c9997561ee7.tar.gz
drakx-backup-do-not-use-f1b239a95402398b493fbda637c97c9997561ee7.tar.bz2
drakx-backup-do-not-use-f1b239a95402398b493fbda637c97c9997561ee7.tar.xz
drakx-backup-do-not-use-f1b239a95402398b493fbda637c97c9997561ee7.zip
{bad_fs_type_magic} is wrong info when we have "encryption" (bugzilla #16893 is about this too)
-rw-r--r--perl-install/fs/type.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 0fa20c2c8..ca227d126 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -360,7 +360,7 @@ sub can_be_one_of_those_fs_types {
sub maybeFormatted {
my ($part) = @_;
- $part->{isFormatted} || !$part->{notFormatted} && !$part->{bad_fs_type_magic};
+ $part->{isFormatted} || !$part->{notFormatted} && (!$part->{bad_fs_type_magic} || $part->{options} =~ /encrypted/);
}
sub set_isFormatted {
my ($part, $val) = @_;