summaryrefslogtreecommitdiffstats
path: root/uncrypt/uncrypt.cpp
diff options
context:
space:
mode:
authorBowgo Tsai <bowgotsai@google.com>2017-03-10 17:13:07 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-03-10 17:13:07 +0100
commit1a76f4a3bcf0498b77c4db30a0b740fb4430ab8c (patch)
treeccfdc525ed4c1ba0bc80c70fbcad2784fc98c4f7 /uncrypt/uncrypt.cpp
parentMerge "recovery: Fix the FIXME in get_menu_selection()." am: f0e8f0727e (diff)
parentMerge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" (diff)
downloadandroid_bootable_recovery-1a76f4a3bcf0498b77c4db30a0b740fb4430ab8c.tar
android_bootable_recovery-1a76f4a3bcf0498b77c4db30a0b740fb4430ab8c.tar.gz
android_bootable_recovery-1a76f4a3bcf0498b77c4db30a0b740fb4430ab8c.tar.bz2
android_bootable_recovery-1a76f4a3bcf0498b77c4db30a0b740fb4430ab8c.tar.lz
android_bootable_recovery-1a76f4a3bcf0498b77c4db30a0b740fb4430ab8c.tar.xz
android_bootable_recovery-1a76f4a3bcf0498b77c4db30a0b740fb4430ab8c.tar.zst
android_bootable_recovery-1a76f4a3bcf0498b77c4db30a0b740fb4430ab8c.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;
}