summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@google.com>2018-04-11 06:07:28 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-04-11 06:07:28 +0200
commitae53bb66cad41cfd0d32f64cfe355942f3822900 (patch)
treec6d54abea68cb738ba24d663a4075db57f4773c6
parentUse the non-LTO, non-PGO version of libhwbinder (diff)
parentMerge "recovery: enable fsverity feature bit" into pi-dev (diff)
downloadandroid_bootable_recovery-ae53bb66cad41cfd0d32f64cfe355942f3822900.tar
android_bootable_recovery-ae53bb66cad41cfd0d32f64cfe355942f3822900.tar.gz
android_bootable_recovery-ae53bb66cad41cfd0d32f64cfe355942f3822900.tar.bz2
android_bootable_recovery-ae53bb66cad41cfd0d32f64cfe355942f3822900.tar.lz
android_bootable_recovery-ae53bb66cad41cfd0d32f64cfe355942f3822900.tar.xz
android_bootable_recovery-ae53bb66cad41cfd0d32f64cfe355942f3822900.tar.zst
android_bootable_recovery-ae53bb66cad41cfd0d32f64cfe355942f3822900.zip
-rw-r--r--roots.cpp1
-rw-r--r--updater/install.cpp10
2 files changed, 5 insertions, 6 deletions
diff --git a/roots.cpp b/roots.cpp
index 8907bbd9b..184e7992b 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -333,6 +333,7 @@ int format_volume(const char* volume, const char* directory) {
"-f",
"-O", "encrypt",
"-O", "quota",
+ "-O", "verity",
"-w", std::to_string(kSectorSize),
v->blk_device,
};
diff --git a/updater/install.cpp b/updater/install.cpp
index 6732ab897..9be7645f3 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -544,12 +544,10 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
const char* f2fs_argv[] = { "mkfs.f2fs",
"-d1",
"-f",
- "-O",
- "encrypt",
- "-O",
- "quota",
- "-w",
- "512",
+ "-O", "encrypt",
+ "-O", "quota",
+ "-O", "verity",
+ "-w", "512",
location.c_str(),
(size < 512) ? nullptr : num_sectors.c_str(),
nullptr };