From 91e631d4ddb692ecaea463e164006825510d48fb Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@google.com>
Date: Wed, 21 Nov 2018 11:12:54 -0800
Subject: make_f2fs: use -g android by default

Bug: 119875846
Change-Id: Ibff18ea6f92620852222fff4073379ec8afd0e10
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
---
 roots.cpp           | 7 +------
 updater/install.cpp | 6 +-----
 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(),
-- 
cgit v1.2.3