diff options
| author | Bowgo Tsai <bowgotsai@google.com> | 2017-03-27 19:47:21 +0200 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2017-03-27 23:25:39 +0200 |
| commit | f18e639ce885e816f7cb2a46b209135ddf717db6 (patch) | |
| tree | ca086e00ef6a77a93d02823f68fae3d7eec53ba6 | |
| parent | merge in oc-release history after reset to master (diff) | |
| download | android_bootable_recovery-f18e639ce885e816f7cb2a46b209135ddf717db6.tar android_bootable_recovery-f18e639ce885e816f7cb2a46b209135ddf717db6.tar.gz android_bootable_recovery-f18e639ce885e816f7cb2a46b209135ddf717db6.tar.bz2 android_bootable_recovery-f18e639ce885e816f7cb2a46b209135ddf717db6.tar.lz android_bootable_recovery-f18e639ce885e816f7cb2a46b209135ddf717db6.tar.xz android_bootable_recovery-f18e639ce885e816f7cb2a46b209135ddf717db6.tar.zst android_bootable_recovery-f18e639ce885e816f7cb2a46b209135ddf717db6.zip | |
| -rw-r--r-- | bootloader_message/bootloader_message.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp index d17e055bb..d8086be28 100644 --- a/bootloader_message/bootloader_message.cpp +++ b/bootloader_message/bootloader_message.cpp @@ -19,7 +19,6 @@ #include <errno.h> #include <fcntl.h> #include <string.h> -#include <unistd.h> #include <string> #include <vector> @@ -31,13 +30,8 @@ #include <fs_mgr.h> static std::string get_misc_blk_device(std::string* err) { - std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(nullptr, fs_mgr_free_fstab); - // Use different fstab paths for normal boot and recovery boot, respectively - if (access("/sbin/recovery", F_OK) == 0) { - fstab.reset(fs_mgr_read_fstab_with_dt("/etc/recovery.fstab")); - } else { - fstab.reset(fs_mgr_read_fstab_default()); - } + 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 ""; |