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

Commit 5c7ec5af authored by Sandeep Patil's avatar Sandeep Patil Committed by android-build-merger
Browse files

Respect that status property when parsing fstab from device tree am: be4302bf 

am: b472ef10

Change-Id: I90eccf22b2d5f52f36e5c8ee136c82d5ca0ec552
parents f9f2292e b472ef10

fs_mgr/fs_mgr_fstab.cpp

+9 −0
Original line number Diff line number Diff line
@@ -404,6 +404,15 @@ static std::string read_fstab_from_dt() { 
        std::vector<std::string> fstab_entry;

        std::string file_name;

        std::string value;

        // skip a partition entry if the status property is present and not set to ok

        file_name = android::base::StringPrintf("%s/%s/status", fstabdir_name.c_str(), dp->d_name);

        if (read_dt_file(file_name, &value)) {

            if (value != "okay" && value != "ok") {

                LINFO << "dt_fstab: Skip disabled entry for partition " << dp->d_name;

                continue;

            }

        }



        file_name = android::base::StringPrintf("%s/%s/dev", fstabdir_name.c_str(), dp->d_name);

        if (!read_dt_file(file_name, &value)) {

            LERROR << "dt_fstab: Failed to find device for partition " << dp->d_name;