Skip to content

Commit 1db5c0f

Browse files
tdmmikeNG
authored andcommitted
Revert "Format formattable partitions if mount fails"
This reverts commit 29dd6b6c01295222fee5ef2fc70692b2ecb12504. Change-Id: I7b76cd920019ae8cb7270b3f83e777ea9de7f7a4
1 parent bd0ff86 commit 1db5c0f

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

fs_mgr/fs_mgr_roots.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,6 @@ bool EnsurePathMounted(Fstab* fstab, const std::string& path, const std::string&
119119
}
120120

121121
int result = fs_mgr_do_mount_one(*rec, mount_point);
122-
if (result == -1 && rec->fs_mgr_flags.formattable) {
123-
PERROR << "Failed to mount " << mount_point << "; formatting";
124-
bool crypt_footer = rec->is_encryptable() && rec->key_loc == "footer";
125-
if (fs_mgr_do_format(*rec, crypt_footer) != 0) {
126-
PERROR << "Failed to format " << mount_point;
127-
return false;
128-
}
129-
result = fs_mgr_do_mount_one(*rec, mount_point);
130-
}
131122

132123
if (result == -1) {
133124
PERROR << "Failed to mount " << mount_point;

0 commit comments

Comments
 (0)