commit ae53bb66cad41cfd0d32f64cfe355942f3822900
author Jaegeuk Kim <jaegeuk@google.com> Tue Apr 10 21:07:28 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 10 21:07:28 2018 -0700
tree c6d54abea68cb738ba24d663a4075db57f4773c6
parent 9e76ce0ad6c645e6f959c3ef291a794df4ead6b9
parent 257dd337da28ccd2f930afe3b55e76873f73c15f

Merge "recovery: enable fsverity feature bit" into pi-dev
am: 257dd337da

Change-Id: I1a7ebb46cdcb32952d4033916b19f41ba91a4689

roots.cpp

diff --git a/roots.cpp b/roots.cpp
index 8907bbd..184e799 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -333,6 +333,7 @@
     "-f",
     "-O", "encrypt",
     "-O", "quota",
+    "-O", "verity",
     "-w", std::to_string(kSectorSize),
     v->blk_device,
   };

updater/install.cpp

diff --git a/updater/install.cpp b/updater/install.cpp
index 6732ab8..9be7645 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -544,12 +544,10 @@
     const char* f2fs_argv[] = { "mkfs.f2fs",
                                 "-d1",
                                 "-f",
-                                "-O",
-                                "encrypt",
-                                "-O",
-                                "quota",
-                                "-w",
-                                "512",
+                                "-O", "encrypt",
+                                "-O", "quota",
+                                "-O", "verity",
+                                "-w", "512",
                                 location.c_str(),
                                 (size < 512) ? nullptr : num_sectors.c_str(),
                                 nullptr };