diff options
| author | Bowgo Tsai <bowgotsai@google.com> | 2017-03-10 16:17:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-10 16:17:39 +0000 |
| commit | 1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b (patch) | |
| tree | c1075f34d7a92dc6ee6723af7c09c7d16ac5594d /uncrypt/uncrypt.cpp | |
| parent | 2d06e3b360f1ace48feae529e32dd9bff607359b (diff) | |
| parent | 1a76f4a3bcf0498b77c4db30a0b740fb4430ab8c (diff) | |
| download | android_bootable_recovery-1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b.tar.gz android_bootable_recovery-1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b.tar.bz2 android_bootable_recovery-1bd484f941ee7b30bf61c5399a7e9c157f1e3f7b.zip | |
Merge "recovery: replacing fs_mgr_read_fstab() with new fs_mgr APIs" am: 7a0dfec771 am: 1a23257214
am: 1a76f4a3bc
Change-Id: I8869ddf69589c2a1bb0e8dd493df67f9126db585
Diffstat (limited to 'uncrypt/uncrypt.cpp')
| -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 4f5b2f80..ad3bdce7 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; } |