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

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

Merge "Respect that status property when parsing fstab from device tree"

am: ea043a1d

Change-Id: Id23c5509001726781778721e7adb5b20a71fd407
parents 93e63396 ea043a1d
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -352,6 +352,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;