summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@google.com>2018-11-28 02:26:01 +0100
committerandroid-build-merger <android-build-merger@google.com>2018-11-28 02:26:01 +0100
commit349d7052b8f39a72c268af5b1f619abcfbda37c1 (patch)
treea821bca517086da3745acb60070157650925f790
parentMerge "Update README.md." am: c075d688fd am: 096d3205b4 (diff)
parentMerge "make_f2fs: use -g android by default" am: 4cd38430d7 (diff)
downloadandroid_bootable_recovery-349d7052b8f39a72c268af5b1f619abcfbda37c1.tar
android_bootable_recovery-349d7052b8f39a72c268af5b1f619abcfbda37c1.tar.gz
android_bootable_recovery-349d7052b8f39a72c268af5b1f619abcfbda37c1.tar.bz2
android_bootable_recovery-349d7052b8f39a72c268af5b1f619abcfbda37c1.tar.lz
android_bootable_recovery-349d7052b8f39a72c268af5b1f619abcfbda37c1.tar.xz
android_bootable_recovery-349d7052b8f39a72c268af5b1f619abcfbda37c1.tar.zst
android_bootable_recovery-349d7052b8f39a72c268af5b1f619abcfbda37c1.zip
-rw-r--r--roots.cpp7
-rw-r--r--updater/install.cpp6
2 files changed, 2 insertions, 11 deletions
diff --git a/roots.cpp b/roots.cpp
index dc347848a..4fcd6feb9 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -344,12 +344,7 @@ int format_volume(const char* volume, const char* directory) {
// clang-format off
std::vector<std::string> make_f2fs_cmd = {
cmd,
- "-d1",
- "-f",
- "-O", "encrypt",
- "-O", "quota",
- "-O", "verity",
- "-w", std::to_string(kSectorSize),
+ "-g", "android",
v->blk_device,
};
// clang-format on
diff --git a/updater/install.cpp b/updater/install.cpp
index deb7a2b02..ccde409df 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -484,11 +484,7 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
const char* f2fs_path = "/sbin/mkfs.f2fs";
const char* f2fs_argv[] = { "mkfs.f2fs",
- "-d1",
- "-f",
- "-O", "encrypt",
- "-O", "quota",
- "-O", "verity",
+ "-g", "android",
"-w", "512",
location.c_str(),
(size < 512) ? nullptr : num_sectors.c_str(),