From b68b02ca5ad1a4700ff44c87b30e670fcb4b5370 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Thu, 5 Apr 2018 22:40:04 -0700 Subject: [PATCH] fastboot, fs_mgr: set fsverity feature bit Bug: 74604441 Bug: 67380979 Change-Id: Ia336be99eed42bbd0eab1b22e2cc3179a92d5233 Signed-off-by: Jaegeuk Kim --- fastboot/fs.cpp | 2 ++ fs_mgr/fs_mgr_format.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/fastboot/fs.cpp b/fastboot/fs.cpp index a1e1677ba..c30ca1e4b 100644 --- a/fastboot/fs.cpp +++ b/fastboot/fs.cpp @@ -177,6 +177,8 @@ static int generate_f2fs_image(const char* fileName, long long partSize, const s 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); diff --git a/fs_mgr/fs_mgr_format.cpp b/fs_mgr/fs_mgr_format.cpp index 63a6839c5..845cca9dc 100644 --- a/fs_mgr/fs_mgr_format.cpp +++ b/fs_mgr/fs_mgr_format.cpp @@ -121,6 +121,7 @@ static int format_f2fs(char *fs_blkdev, uint64_t dev_sz, bool crypt_footer) "-f", "-O", "encrypt", "-O", "quota", + "-O", "verity", "-w", "4096", fs_blkdev, size_str.c_str(),