commit d77ae137c64fc160545ce3e035364646ede1ddd3
author A. Cody Schuffelen <schuffelen@google.com> Wed Mar 04 18:47:31 2020 -0800
committer Alistair Delva <adelva@google.com> Wed May 20 00:46:26 2020 +0000
tree 9f2fa953e659e008d7281afbb09b508427568def
parent 64cb1450999b9ef3c9a4d2c1d49ca3dc63097a21

Support -blank_data_image_fmt="ext4".

Still requires using an alternate fstab to work correctly.

Bug: 150654269
Bug: 156286088
Test: `launch_cvd -data_policy=always_create -blank_data_image_mb 2048
       -blank_data_image_fmt=ext` with ext4 fstab
Change-Id: Iba9850980dc628c699a64284744412545fe3ef40
Merged-In: Iba9850980dc628c699a64284744412545fe3ef40

host/commands/assemble_cvd/data_image.cc

diff --git a/host/commands/assemble_cvd/data_image.cc b/host/commands/assemble_cvd/data_image.cc
index e184cb8..9b0ca12 100644
--- a/host/commands/assemble_cvd/data_image.cc
+++ b/host/commands/assemble_cvd/data_image.cc
@@ -73,7 +73,9 @@
   count += std::to_string(block_count);
   std::string bs = "bs=" + block_size;
   cvd::execute({"/bin/dd", "if=/dev/zero", of, bs, count});
-  if (image_fmt != "none") {
+  if (image_fmt == "ext4") {
+    cvd::execute({"/sbin/mkfs.ext4", image});
+  } else if (image_fmt != "none") {
     auto make_f2fs_path = vsoc::DefaultHostArtifactsPath("bin/make_f2fs");
     cvd::execute({make_f2fs_path, "-t", image_fmt, image, "-g", "android"});
   }