summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-03-27 21:37:04 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-03-27 21:37:04 +0200
commit6ff8c6ac18452f652f1906df2d972aa0909ba1c3 (patch)
treeca086e00ef6a77a93d02823f68fae3d7eec53ba6
parentMerge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea -s ours am: a97b0712d8 -s ours (diff)
parentMerge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853 (diff)
downloadandroid_bootable_recovery-6ff8c6ac18452f652f1906df2d972aa0909ba1c3.tar
android_bootable_recovery-6ff8c6ac18452f652f1906df2d972aa0909ba1c3.tar.gz
android_bootable_recovery-6ff8c6ac18452f652f1906df2d972aa0909ba1c3.tar.bz2
android_bootable_recovery-6ff8c6ac18452f652f1906df2d972aa0909ba1c3.tar.lz
android_bootable_recovery-6ff8c6ac18452f652f1906df2d972aa0909ba1c3.tar.xz
android_bootable_recovery-6ff8c6ac18452f652f1906df2d972aa0909ba1c3.tar.zst
android_bootable_recovery-6ff8c6ac18452f652f1906df2d972aa0909ba1c3.zip
-rw-r--r--bootloader_message/bootloader_message.cpp10
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 "";