summaryrefslogtreecommitdiffstats
path: root/uncrypt/uncrypt.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-03-10 17:06:00 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-03-10 17:06:01 +0100
commit7a0dfec771e787b12273a85708bb02493a96b997 (patch)
treed31cee0706e0d942689c65cd30a0edf94c591c32 /uncrypt/uncrypt.cpp
parentMerge "recovery: Fix the FIXME in get_menu_selection()." (diff)
parentrecovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs (diff)
downloadandroid_bootable_recovery-7a0dfec771e787b12273a85708bb02493a96b997.tar
android_bootable_recovery-7a0dfec771e787b12273a85708bb02493a96b997.tar.gz
android_bootable_recovery-7a0dfec771e787b12273a85708bb02493a96b997.tar.bz2
android_bootable_recovery-7a0dfec771e787b12273a85708bb02493a96b997.tar.lz
android_bootable_recovery-7a0dfec771e787b12273a85708bb02493a96b997.tar.xz
android_bootable_recovery-7a0dfec771e787b12273a85708bb02493a96b997.tar.zst
android_bootable_recovery-7a0dfec771e787b12273a85708bb02493a96b997.zip
Diffstat (limited to 'uncrypt/uncrypt.cpp')
-rw-r--r--uncrypt/uncrypt.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index a06384dd5..07d183be2 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -163,20 +163,9 @@ static void add_block_to_ranges(std::vector<int>& ranges, int new_block) {
}
static struct fstab* read_fstab() {
- fstab = NULL;
-
- // The fstab path is always "/fstab.${ro.hardware}".
- std::string ro_hardware = android::base::GetProperty("ro.hardware", "");
- if (ro_hardware.empty()) {
- LOG(ERROR) << "failed to get ro.hardware";
- return NULL;
- }
-
- std::string fstab_path = "/fstab." + ro_hardware;
-
- fstab = fs_mgr_read_fstab(fstab_path.c_str());
+ fstab = fs_mgr_read_fstab_default();
if (!fstab) {
- LOG(ERROR) << "failed to read " << fstab_path;
+ LOG(ERROR) << "failed to read default fstab";
return NULL;
}