PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9d

Browse Source 
am: d7865e81f1

Change-Id: I391ec86730d409d0d6c51e003d57f4f3f0a4a3e3
This commit is contained in:
Johan Harvyl
2016-08-15 18:12:05 +00:00
committed by android-build-merger
parent 30f1ad1169 d7865e81f1
commit 63e4cc1d16
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roots.cpp
+14 -1
View File
@@ -102,7 +102,20 @@ int ensure_path_mounted_at(const char* path, const char* mount_point) {
if (strcmp(v->fs_type, "ext4") == 0 ||
strcmp(v->fs_type, "squashfs") == 0 ||
strcmp(v->fs_type, "vfat") == 0) {
if (mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options) == -1) {
int result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
if (result == -1 && fs_mgr_is_formattable(v)) {
LOGE("failed to mount %s (%s), formatting ...\n",
mount_point, strerror(errno));
bool crypt_footer = fs_mgr_is_encryptable(v) && !strcmp(v->key_loc, "footer");
if (fs_mgr_do_format(v, crypt_footer) == 0) {
result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
} else {
LOGE("failed to format %s (%s)\n", mount_point, strerror(errno));
return -1;
}
}
if (result == -1) {
LOGE("failed to mount %s (%s)\n", mount_point, strerror(errno));
return -1;
}