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 /bootloader_message | |
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 '')
-rw-r--r-- | bootloader_message/bootloader_message.cpp | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp index b873d3dc3..d8086be28 100644 --- a/bootloader_message/bootloader_message.cpp +++ b/bootloader_message/bootloader_message.cpp @@ -29,27 +29,14 @@ #include <android-base/unique_fd.h> #include <fs_mgr.h> -static struct fstab* read_fstab(std::string* err) { - std::string ro_hardware = android::base::GetProperty("ro.hardware", ""); - if (ro_hardware.empty()) { - *err = "failed to get ro.hardware"; - return nullptr; - } - // The fstab path is always "/fstab.${ro.hardware}". - std::string fstab_path = "/fstab." + ro_hardware; - struct fstab* fstab = fs_mgr_read_fstab(fstab_path.c_str()); - if (fstab == nullptr) { - *err = "failed to read " + fstab_path; - } - return fstab; -} - static std::string get_misc_blk_device(std::string* err) { - struct fstab* fstab = read_fstab(err); - if (fstab == nullptr) { + std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(), + fs_mgr_free_fstab); + if (!fstab) { + *err = "failed to read default fstab"; return ""; } - fstab_rec* record = fs_mgr_get_entry_for_mount_point(fstab, "/misc"); + fstab_rec* record = fs_mgr_get_entry_for_mount_point(fstab.get(), "/misc"); if (record == nullptr) { *err = "failed to find /misc partition"; return ""; |