commit b0e768e26958214f9508b25e096be7d545830750
author Tao Bao <tbao@google.com> Mon Mar 27 19:29:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 27 19:29:34 2017 +0000
tree 88410580cb78ff3ac587e9014e52bf602f59b05a
parent a97b0712d81f3623b8ae3e636c0b5e8247e009b0
parent 27c3e47853b27d08fb6b1e250212b785c915c1a6

Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot""
am: 27c3e47853

Change-Id: Ie55f8cbbcec911192d9fd3b92f32731721dba36f

bootloader_message/bootloader_message.cpp

diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp
index d17e055..d8086be 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 "";