commit 4e8b3e5d1fd653e1527f8db15a03d061ea99d40d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 11 03:59:58 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 11 03:59:58 2018 +0000
tree fc1e269303b560b57f7c271c974cffb5e96bef97
parent 3b9a6f28283380d12dc6fb79c462c559d974c1cc
parent cca4bf34b3de5ab570bad3d323e464a59d15245e

Merge "fastboot, fs_mgr: set fsverity feature bit" into pi-dev

fastboot/fs.cpp

diff --git a/fastboot/fs.cpp b/fastboot/fs.cpp
index a1e1677..c30ca1e 100644
--- a/fastboot/fs.cpp
+++ b/fastboot/fs.cpp
@@ -177,6 +177,8 @@
     mkf2fs_args.push_back("encrypt");
     mkf2fs_args.push_back("-O");
     mkf2fs_args.push_back("quota");
+    mkf2fs_args.push_back("-O");
+    mkf2fs_args.push_back("verity");
     mkf2fs_args.push_back(fileName);
     mkf2fs_args.push_back(nullptr);
 

fs_mgr/fs_mgr_format.cpp

diff --git a/fs_mgr/fs_mgr_format.cpp b/fs_mgr/fs_mgr_format.cpp
index 63a6839..845cca9 100644
--- a/fs_mgr/fs_mgr_format.cpp
+++ b/fs_mgr/fs_mgr_format.cpp
@@ -121,6 +121,7 @@
         "-f",
         "-O", "encrypt",
         "-O", "quota",
+        "-O", "verity",
         "-w", "4096",
         fs_blkdev,
         size_str.c_str(),