commit 5b88b5289af87196d46f71b96817e8f9edd5dc35
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 11 03:48:47 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 11 03:48:48 2017 +0000
tree 1703dbee86945ebb45cf9d92fa1057a4498c772d
parent 61f66033d5e6a75afa32279273a20aa5caa3c7d1
parent b3d5ba44910310da454bf221e46ed84175a21287

Merge "fstest: replacing fs_mgr_read_fstab() with fs_mgr_read_fstab_default()"

boot_control_copy/bootinfo.c

diff --git a/boot_control_copy/bootinfo.c b/boot_control_copy/bootinfo.c
index 82a134f..66ccba2 100644
--- a/boot_control_copy/bootinfo.c
+++ b/boot_control_copy/bootinfo.c
@@ -39,17 +39,11 @@
 // that's what's being used.
 static struct fstab *open_fstab(void)
 {
-  char propbuf[PROPERTY_VALUE_MAX];
-  char fstab_name[PROPERTY_VALUE_MAX + 32];
-  struct fstab *fstab;
-
-  property_get("ro.hardware", propbuf, "");
-  snprintf(fstab_name, sizeof(fstab_name), "/fstab.%s", propbuf);
-  fstab = fs_mgr_read_fstab(fstab_name);
+  struct fstab *fstab = fs_mgr_read_fstab_default();
   if (fstab != NULL)
     return fstab;
 
-  fstab = fs_mgr_read_fstab("/fstab.device");
+  fstab = fs_mgr_read_fstab_with_dt("/fstab.device");
   return fstab;
 }