commit 494d97fe6b456e516cf210f01a4436d488658306
author Tao Bao <tbao@google.com> Fri May 12 21:26:34 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 12 21:26:36 2017 +0000
tree d81f7976eb40bfbd7a32f47274532d1230ead02e
parent 7cb1b796731fa35a6556263876648746710f003b
parent 397a8137a0074ade60eee5efb32cc5a46c8af73c

Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0."

updater/install.cpp

diff --git a/updater/install.cpp b/updater/install.cpp
index 888239c..c5f9a89 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -317,9 +317,11 @@
     std::string num_sectors = std::to_string(size / 512);
 
     const char* f2fs_path = "/sbin/mkfs.f2fs";
-    const char* const f2fs_argv[] = { "mkfs.f2fs", "-t", "-d1", location.c_str(),
-                                      num_sectors.c_str(), nullptr };
-    int status = exec_cmd(f2fs_path, const_cast<char* const*>(f2fs_argv));
+    const char* f2fs_argv[] = {
+      "mkfs.f2fs", "-t", "-d1", location.c_str(), (size < 512) ? nullptr : num_sectors.c_str(),
+      nullptr
+    };
+    int status = exec_cmd(f2fs_path, const_cast<char**>(f2fs_argv));
     if (status != 0) {
       LOG(ERROR) << name << ": mkfs.f2fs failed (" << status << ") on " << location;
       return StringValue("");