Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fd5f5c2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Mark block device as rw before encryptFstab" into main am: 1eac97ca 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2903391



Change-Id: I3f33f4c9652fb34b620e05fc5c60364e7a81dafd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9fb26efb 1eac97ca

fs_mgr/fs_mgr.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1550,6 +1550,7 @@ MountAllResult fs_mgr_mount_all(Fstab* fstab, int mount_mode) { 
                }

                encryptable = status;

                if (status == FS_MGR_MNTALL_DEV_NEEDS_METADATA_ENCRYPTION) {

                    fs_mgr_set_blk_ro(attempted_entry.blk_device, false);

                    if (!call_vdc({"cryptfs", "encryptFstab", attempted_entry.blk_device,

                                   attempted_entry.mount_point, wiped ? "true" : "false",

                                   attempted_entry.fs_type, attempted_entry.zoned_device},