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

Commit 5fd877df authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "Adding wait for a device file before mount" am: bd742a15 am:... 

Merge "Adding wait for a device file before mount" am: bd742a15 am: d5401ddf am: 39800452 am: b9fc4794

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

Change-Id: I87154d64084cf30626d1eca04880b283b742a9b8
parents 79ebd2ea b9fc4794

fs_mgr/fs_mgr.cpp

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

// wrapper to __mount() and expects a fully prepared fstab_rec,

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

// 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) {

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

    // Run fsck if needed

    prepare_fs_for_mount(entry.blk_device, entry);

    prepare_fs_for_mount(entry.blk_device, entry);