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

This commit is contained in:
TreeHugger Robot 2018-04-11 03:59:58 +00:00 committed by Android (Google) Code Review
commit 44fd93d0d3
2 changed files with 3 additions and 0 deletions

View file

@ -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);

View file

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