commit 9539cdb3c03c88ef366b48aca55a641f0b78066e
author Tao Bao <tbao@google.com> Fri May 12 21:51:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 12 21:51:17 2017 +0000
tree e802a704082b12a6daefaff0a450905c73c620f0
parent e89cbd675cfdb7cbad3252862b02379bab808fda
parent 843ca31c4c559142073abe23c7ded7b4bb954b24

Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b
am: 843ca31c4c

Change-Id: I3f7c6b2d4b4d7b56866f98e146cb3bf691a7a3f3

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("");