commit 6a784c88ebf375f80842336833dd7201b6938f12
author Tom Cherry <tomcherry@google.com> Wed Nov 30 03:27:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 03:27:47 2016 +0000
tree 00081112a9bca9e9ecbe29cf46530819cb9ce079
parent 8ff379c9a38d389b8de643d46ca88b722ce57f9e
parent b11b2b01b5c981f18ad616a07542b090f8d3745c

resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp
am: 524afcec4a

Change-Id: I80326f8588a36674d0016df12e4f5f5f70c999a3

fs_mgr/fs_mgr_verity.cpp

diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
index bec5eec..bb61b93 100644
--- a/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@ -825,7 +825,7 @@
     char fstab_filename[PROPERTY_VALUE_MAX + sizeof(FSTAB_PREFIX)];
     const char *mount_point;
     char propbuf[PROPERTY_VALUE_MAX];
-    char *status;
+    const char *status;
     int fd = -1;
     int i;
     int mode;
@@ -875,9 +875,13 @@
         verity_ioctl_init(io, mount_point, 0);
 
         if (ioctl(fd, DM_TABLE_STATUS, io)) {
-            ERROR("Failed to query DM_TABLE_STATUS for %s (%s)\n", mount_point,
-                strerror(errno));
-            continue;
+            if (fstab->recs[i].fs_mgr_flags & MF_VERIFYATBOOT) {
+                status = "V";
+            } else {
+                ERROR("Failed to query DM_TABLE_STATUS for %s (%s)\n", mount_point,
+                      strerror(errno));
+                continue;
+            }
         }
 
         status = &buffer[io->data_start + sizeof(struct dm_target_spec)];