commit b68b02ca5ad1a4700ff44c87b30e670fcb4b5370
author Jaegeuk Kim <jaegeuk@google.com> Thu Apr 05 22:40:04 2018 -0700
committer Jaegeuk Kim <jaegeuk@google.com> Fri Apr 06 10:18:21 2018 -0700
tree 897690e04ee82d097998175cec6839060ef23174
parent 9a67c69e6c7b0eeeee70ddf2a47a678c5b7f839a

fastboot, fs_mgr: set fsverity feature bit

Bug: 74604441
Bug: 67380979
Change-Id: Ia336be99eed42bbd0eab1b22e2cc3179a92d5233
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>

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(),