diff options
author | Bowgo Tsai <bowgotsai@google.com> | 2017-03-10 17:17:39 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-03-10 17:17:39 +0100 |
commit | 1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b (patch) | |
tree | c1075f34d7a92dc6ee6723af7c09c7d16ac5594d /uncrypt | |
parent | Merge "recovery: Fix the FIXME in get_menu_selection()." am: f0e8f0727e am: 316610763b (diff) | |
parent | Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771 (diff) | |
download | android_bootable_recovery-1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b.tar android_bootable_recovery-1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b.tar.gz android_bootable_recovery-1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b.tar.bz2 android_bootable_recovery-1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b.tar.lz android_bootable_recovery-1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b.tar.xz android_bootable_recovery-1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b.tar.zst android_bootable_recovery-1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b.zip |
Diffstat (limited to 'uncrypt')
-rw-r--r-- | uncrypt/uncrypt.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 4f5b2f807..ad3bdce7a 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; } |