commit 2d93209f23aa548061fec6dd10a848dba6823efe
author Tao Bao <tbao@google.com> Mon Mar 27 19:32:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 27 19:32:12 2017 +0000
tree fcc9f4c8c1dfce91fbd3ba002e212c2105128957
parent dac63291c39731f54c124f57b168364c76004780
parent 42c1ca23088d7cb400d53830fffeb0054cff03b0

Merge "fs_mgr: use different fstab paths for normal/recovery boot" am: 9c59029add
am: 07052c0509

Change-Id: I63466cb1770c99665fbfc96bd19ab9f770a2e429

fs_mgr/fs_mgr_fstab.cpp

diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index a4f88ba..720ec03 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -646,7 +646,10 @@
     std::string hw;
     std::string default_fstab;
 
-    if (fs_mgr_get_boot_config("hardware", &hw)) {
+    // Use different fstab paths for normal boot and recovery boot, respectively
+    if (access("/sbin/recovery", F_OK) == 0) {
+        default_fstab = "/etc/recovery.fstab";
+    } else if (fs_mgr_get_boot_config("hardware", &hw)) {  // normal boot
         for (const char *prefix : {"/odm/etc/fstab.","/vendor/etc/fstab.", "/fstab."}) {
             default_fstab = prefix + hw;
             if (access(default_fstab.c_str(), F_OK) == 0) break;