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

Commit 42c32bf9 authored by David Anderson's avatar David Anderson
Browse files

init: Allow first-stage mounts in the second stage if they're formattable. 

If /metadata is wiped, but is specified as a first-stage mount, it'll
fail to mount and then skipped as a mount in the second stage. Rather
than add a new flag, this patch piggy-backs on "formattable" since
otherwise there is no way the file system will be formatted.

Bug: 121209697
Test: flashall -w && reboot
Change-Id: If36a12251f398a99b9423713a8bfbe8c33523b66
parent 400c71fc

fs_mgr/fs_mgr.cpp

+21 −1
Original line number Diff line number Diff line
@@ -954,6 +954,17 @@ class CheckpointManager { 
    std::map<std::string, std::string> device_map_;

};



static bool IsMountPointMounted(const std::string& mount_point) {

    // Check if this is already mounted.

    Fstab fstab;

    if (!ReadFstabFromFile("/proc/mounts", &fstab)) {

        return false;

    }

    auto it = std::find_if(fstab.begin(), fstab.end(),

                           [&](const auto& entry) { return entry.mount_point == mount_point; });

    return it != fstab.end();

}



// When multiple fstab records share the same mount_point, it will try to mount each

// one in turn, and ignore any duplicates after a first successful mount.

// Returns -1 on error, and  FS_MGR_MNTALL_* otherwise.
@@ -970,9 +981,18 @@ int fs_mgr_mount_all(Fstab* fstab, int mount_mode) { 
    for (size_t i = 0; i < fstab->size(); i++) {

        auto& current_entry = (*fstab)[i];



        // If a filesystem should have been mounted in the first stage, we

        // ignore it here. With one exception, if the filesystem is

        // formattable, then it can only be formatted in the second stage,

        // so we allow it to mount here.

        if (current_entry.fs_mgr_flags.first_stage_mount &&

            (!current_entry.fs_mgr_flags.formattable ||

             IsMountPointMounted(current_entry.mount_point))) {

            continue;

        }



        // Don't mount entries that are managed by vold or not for the mount mode.

        if (current_entry.fs_mgr_flags.vold_managed || current_entry.fs_mgr_flags.recovery_only ||

            current_entry.fs_mgr_flags.first_stage_mount ||

            ((mount_mode == MOUNT_MODE_LATE) && !current_entry.fs_mgr_flags.late_mount) ||

            ((mount_mode == MOUNT_MODE_EARLY) && current_entry.fs_mgr_flags.late_mount)) {

            continue;