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

Commit 9b1e7a34 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

init: IsDmLinearEnabled() replace with check if logical partitions present in fstab 

IsDmLinearEnabled() true if logical partitions present in fstab.

Test: boot on logical device
Bug: 109821005
Change-Id: Ic083b0b8d9f7e9511d78bdc05c9f848521f1feb5
parent db8b2afe

init/first_stage_mount.cpp

+8 −16
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ class FirstStageMount { 
    bool CreateLogicalPartitions();

    bool MountPartition(fstab_rec* fstab_rec);

    bool MountPartitions();

    bool IsDmLinearEnabled();

    bool GetBackingDmLinearDevices();



    virtual ListenerAction UeventCallback(const Uevent& uevent);
@@ -130,22 +131,6 @@ static bool IsRecoveryMode() { 
    return !force_normal_boot && access("/system/bin/recovery", F_OK) == 0;

}



static inline bool IsDmLinearEnabled() {

    static bool checked = false;

    static bool enabled = false;

    if (checked) {

        return enabled;

    }

    import_kernel_cmdline(false,

                          [](const std::string& key, const std::string& value, bool in_qemu) {

                              if (key == "androidboot.logical_partitions" && value == "1") {

                                  enabled = true;

                              }

                          });

    checked = true;

    return enabled;

}



// Class Definitions

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

FirstStageMount::FirstStageMount()
@@ -194,6 +179,13 @@ bool FirstStageMount::InitDevices() { 
    return GetBackingDmLinearDevices() && GetDmVerityDevices() && InitRequiredDevices();

}



bool FirstStageMount::IsDmLinearEnabled() {

    for (auto fstab_rec : mount_fstab_recs_) {

        if (fs_mgr_is_logical(fstab_rec)) return true;

    }

    return false;

}



bool FirstStageMount::GetBackingDmLinearDevices() {

    // Add any additional devices required for dm-linear mappings.

    if (!IsDmLinearEnabled()) {