commit 463d8447e7e55777cae7c59bf6652ce475589ed0
author Bowgo Tsai <bowgotsai@google.com> Fri Mar 10 16:09:49 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 10 16:09:49 2017 +0000
tree b246e620b313bb8efa91d120f317b39d5adfc492
parent 302b8179b8b5c1d834c37a2a1d2d9fdcf31c3633
parent d998b820ef2ca391cef551159dacf5afce6cff98

Replacing fs_mgr_read_fstab() with new fs_mgr APIs
am: d998b820ef

Change-Id: Id4179c306ad3fc1a5a8b66d26613a46cf263bd76

utils_android.cc

diff --git a/utils_android.cc b/utils_android.cc
index a4f1ea8..bda7337 100644
--- a/utils_android.cc
+++ b/utils_android.cc
@@ -28,16 +28,11 @@
 // Open the appropriate fstab file and fallback to /fstab.device if
 // that's what's being used.
 static struct fstab* OpenFSTab() {
-  char propbuf[PROPERTY_VALUE_MAX];
-  struct fstab* fstab;
-
-  property_get("ro.hardware", propbuf, "");
-  string fstab_name = string("/fstab.") + propbuf;
-  fstab = fs_mgr_read_fstab(fstab_name.c_str());
+  struct fstab* fstab = fs_mgr_read_fstab_default();
   if (fstab != nullptr)
     return fstab;
 
-  fstab = fs_mgr_read_fstab("/fstab.device");
+  fstab = fs_mgr_read_fstab_with_dt("/fstab.device");
   return fstab;
 }