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

Commit 589b7dfd authored by Will Shiu's avatar Will Shiu Committed by Denis Hsu
Browse files

Adding wait for a device file before mount 

Adding the function, fs_mgr_wait_for_file(), to ensure the
device file exists before to mount

Bug: 154278078
Change-Id: I74a68224073932773be18a79f9334d83ea5b6947
parent 7a5b3970

fs_mgr/fs_mgr.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1736,6 +1736,11 @@ int fs_mgr_remount_userdata_into_checkpointing(Fstab* fstab) { 
// wrapper to __mount() and expects a fully prepared fstab_rec,

// unlike fs_mgr_do_mount which does more things with avb / verity etc.

int fs_mgr_do_mount_one(const FstabEntry& entry, const std::string& mount_point) {

    // First check the filesystem if requested.

    if (entry.fs_mgr_flags.wait && !WaitForFile(entry.blk_device, 20s)) {

        LERROR << "Skipping mounting '" << entry.blk_device << "'";

    }



    // Run fsck if needed

    prepare_fs_for_mount(entry.blk_device, entry);