Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be58b363 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by android-build-merger
Browse files

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

am: 64673e14

Change-Id: I82f74a8146664e18f2d9ade1d77fdc48ece3efcd
parents 4eeb5fe9 64673e14

fastboot/fs.cpp

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,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);

fs_mgr/fs_mgr_format.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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(),