summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Marshall <tdm.code@gmail.com>2017-09-06 17:49:04 +0000
committeralk3pInjection <webmaster@raspii.tech>2022-01-11 21:20:40 +0800
commit76d7f37a6441b171b63cfd07cc56d0ddfcaa2130 (patch)
treef8c08e4793c09f8e1f8263afb6915b3ba4995ac1
parentb886c7e1963cd92cbb6168f9ee1ecf1d4f2abd78 (diff)
Revert "Format formattable partitions if mount fails"
This reverts commit 29dd6b6c01295222fee5ef2fc70692b2ecb12504. Change-Id: I7b76cd920019ae8cb7270b3f83e777ea9de7f7a4
-rw-r--r--fs_mgr/fs_mgr_roots.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/fs_mgr/fs_mgr_roots.cpp b/fs_mgr/fs_mgr_roots.cpp
index fdaffbeb0..93d3e31e5 100644
--- a/fs_mgr/fs_mgr_roots.cpp
+++ b/fs_mgr/fs_mgr_roots.cpp
@@ -119,15 +119,6 @@ bool EnsurePathMounted(Fstab* fstab, const std::string& path, const std::string&
}
int result = fs_mgr_do_mount_one(*rec, mount_point);
- if (result == -1 && rec->fs_mgr_flags.formattable) {
- PERROR << "Failed to mount " << mount_point << "; formatting";
- bool crypt_footer = rec->is_encryptable() && rec->key_loc == "footer";
- if (fs_mgr_do_format(*rec, crypt_footer) != 0) {
- PERROR << "Failed to format " << mount_point;
- return false;
- }
- result = fs_mgr_do_mount_one(*rec, mount_point);
- }
if (result == -1) {
PERROR << "Failed to mount " << mount_point;