2 files changed, 22 insertions, 5 deletions

diff --git a/roots.cpp b/roots.cpp
index 9ff5186c1..8907bbd9b 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -324,19 +324,34 @@ int format_volume(const char* volume, const char* directory) {
   }
 
   // Has to be f2fs because we checked earlier.
+  static constexpr int kSectorSize = 4096;
   std::string cmd("/sbin/mkfs.f2fs");
-  std::vector<std::string> make_f2fs_cmd = { cmd,       "-d1", "-f",    "-O",
-                                             "encrypt", "-O",  "quota", v->blk_device };
-  if (length >= 512) {
-    make_f2fs_cmd.push_back(std::to_string(length / 512));
+  // clang-format off
+  std::vector<std::string> make_f2fs_cmd = {
+    cmd,
+    "-d1",
+    "-f",
+    "-O", "encrypt",
+    "-O", "quota",
+    "-w", std::to_string(kSectorSize),
+    v->blk_device,
+  };
+  // clang-format on
+  if (length >= kSectorSize) {
+    make_f2fs_cmd.push_back(std::to_string(length / kSectorSize));
   }
 
   int result = exec_cmd(make_f2fs_cmd);
   if (result == 0 && directory != nullptr) {
     cmd = "/sbin/sload.f2fs";
+    // clang-format off
     std::vector<std::string> sload_f2fs_cmd = {
-      cmd, "-f", directory, "-t", volume, v->blk_device,
+      cmd,
+      "-f", directory,
+      "-t", volume,
+      v->blk_device,
     };
+    // clang-format on
     result = exec_cmd(sload_f2fs_cmd);
   }
   if (result != 0) {
diff --git a/updater/install.cpp b/updater/install.cpp
index 2b6c20fe3..6732ab897 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -548,6 +548,8 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
                                 "encrypt",
                                 "-O",
                                 "quota",
+                                "-w",
+                                "512",
                                 location.c_str(),
                                 (size < 512) ? nullptr : num_sectors.c_str(),
                                 nullptr };