diff options
| author | Tao Bao <tbao@google.com> | 2017-03-27 21:23:11 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-27 21:23:12 +0200 |
| commit | 27c3e47853b27d08fb6b1e250212b785c915c1a6 (patch) | |
| tree | eb583f7ee61da78c7b86b315de66d34d7009f7c9 | |
| parent | Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" (diff) | |
| parent | Revert "libbootloader_message: use different fstab paths for normal/recovery boot" (diff) | |
| download | android_bootable_recovery-27c3e47853b27d08fb6b1e250212b785c915c1a6.tar android_bootable_recovery-27c3e47853b27d08fb6b1e250212b785c915c1a6.tar.gz android_bootable_recovery-27c3e47853b27d08fb6b1e250212b785c915c1a6.tar.bz2 android_bootable_recovery-27c3e47853b27d08fb6b1e250212b785c915c1a6.tar.lz android_bootable_recovery-27c3e47853b27d08fb6b1e250212b785c915c1a6.tar.xz android_bootable_recovery-27c3e47853b27d08fb6b1e250212b785c915c1a6.tar.zst android_bootable_recovery-27c3e47853b27d08fb6b1e250212b785c915c1a6.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 ""; |