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

Commit 06ed613e authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

first stage mount: removing the restriction of mount points 

Current first stage mount only allows three mount points: system, vendor
and/or odm. This was introduced by project Treble to mount those
verified partitions early. However, there might be some other custom
partitions needs to be mounted early as well. This CL removes the
restriction and does first stage mount for whatever specified in
fstab-dt.

Bug: 62423887
Test: first stage mount /vendor with vboot 1.0
Test: first stage mount /vendor with vboot 2.0 (AVB)

Change-Id: I6c146c64e673c35c2823523ccbde193590430c48
parent 4db472b7

fs_mgr/fs_mgr_fstab.cpp

+2 −10
Original line number Diff line number Diff line
@@ -337,16 +337,8 @@ static std::string read_fstab_from_dt() { 


    dirent* dp;

    while ((dp = readdir(fstabdir.get())) != NULL) {

        // skip over name and compatible

        if (dp->d_type != DT_DIR) {

            continue;

        }



        // skip if its not 'vendor', 'odm' or 'system'

        if (strcmp(dp->d_name, "odm") && strcmp(dp->d_name, "system") &&

            strcmp(dp->d_name, "vendor")) {

            continue;

        }

        // skip over name, compatible and .

        if (dp->d_type != DT_DIR || dp->d_name[0] == '.') continue;



        // create <dev> <mnt_point>  <type>  <mnt_flags>  <fsmgr_flags>\n

        std::vector<std::string> fstab_entry;

init/init_first_stage.cpp

+6 −9
Original line number Diff line number Diff line
@@ -60,9 +60,8 @@ class FirstStageMount { 
    virtual bool SetUpDmVerity(fstab_rec* fstab_rec) = 0;



    bool need_dm_verity_;

    // Device tree fstab entries.



    std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> device_tree_fstab_;

    // Eligible first stage mount candidates, only allow /system, /vendor and/or /odm.

    std::vector<fstab_rec*> mount_fstab_recs_;

    std::set<std::string> required_devices_partition_names_;

    DeviceHandler device_handler_;
@@ -115,12 +114,10 @@ FirstStageMount::FirstStageMount() 
        LOG(ERROR) << "Failed to read fstab from device tree";

        return;

    }

    for (auto mount_point : {"/system", "/vendor", "/odm"}) {

        fstab_rec* fstab_rec =

            fs_mgr_get_entry_for_mount_point(device_tree_fstab_.get(), mount_point);

        if (fstab_rec != nullptr) {

            mount_fstab_recs_.push_back(fstab_rec);

        }

    // Stores device_tree_fstab_->recs[] into mount_fstab_recs_ (vector<fstab_rec*>)

    // for easier manipulation later, e.g., range-base for loop.

    for (int i = 0; i < device_tree_fstab_->num_entries; i++) {

        mount_fstab_recs_.push_back(&device_tree_fstab_->recs[i]);

    }

}
@@ -420,7 +417,7 @@ bool FirstStageMountVBootV2::InitAvbHandle() { 


// Public functions

// ----------------

// Mounts /system, /vendor, and/or /odm if they are present in the fstab provided by device tree.

// Mounts partitions specified by fstab in device tree.

bool DoFirstStageMount() {

    // Skips first stage mount if we're in recovery mode.

    if (IsRecoveryMode()) {