openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: faad4c62f8

Change-Id: If3523d7fd0ff91ee727bb3f021ce2c5c3739e0b6
This commit is contained in:
Sandeep Patil 2017-05-30 19:21:54 +00:00 committed by android-build-merger
parent d89f523bdf faad4c62f8
commit 485f5b606d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs_mgr/fs_mgr_fstab.cpp
View File

@ -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;