commit ba8f8e99210af0df246f66deaafcb869a110f222
author Paul Trautrim <paultrautrim@google.com> Tue Mar 12 17:55:48 2019 +0900
committer Alistair Strachan <astrachan@google.com> Tue Mar 19 21:47:50 2019 +0000
tree 6584b2e48d68cb6d22a0b21771c5e8320dca1f1a
parent e1c03210df67176507f3c986fa92a1eb4d4b3870

Generate metadata partition

Bug: 128222953
Test: boot
Change-Id: I103a02c598645420eb8fac5cf41983a64827c218

host/commands/launch/flags.cc

diff --git a/host/commands/launch/flags.cc b/host/commands/launch/flags.cc
index f6f355e..2941a2c 100644
--- a/host/commands/launch/flags.cc
+++ b/host/commands/launch/flags.cc
@@ -25,6 +25,10 @@
     "Path to the system image, if empty it is assumed to be a file named "
     "system.img in the directory specified by -system_image_dir");
 DEFINE_string(cache_image, "", "Location of the cache partition image.");
+DEFINE_string(metadata_image, "", "Location of the metadata partition image "
+              "to be generated.");
+DEFINE_int32(blank_metadata_image_mb, 16,
+             "The size of the blank metadata image to generate, MB.");
 DEFINE_int32(cpus, 2, "Virtual CPU count.");
 DEFINE_string(data_image, "", "Location of the data partition image.");
 DEFINE_string(data_policy, "use_existing", "How to handle userdata partition."
@@ -213,6 +217,9 @@
   std::string default_vendor_image = FLAGS_system_image_dir + "/vendor.img";
   SetCommandLineOptionWithMode("vendor_image", default_vendor_image.c_str(),
                                google::FlagSettingMode::SET_FLAGS_DEFAULT);
+  std::string default_metadata_image = FLAGS_system_image_dir + "/metadata.img";
+  SetCommandLineOptionWithMode("metadata_image", default_metadata_image.c_str(),
+                               google::FlagSettingMode::SET_FLAGS_DEFAULT);
 
   return true;
 }
@@ -336,6 +343,7 @@
   tmp_config_obj.set_cache_image_path(FLAGS_cache_image);
   tmp_config_obj.set_data_image_path(FLAGS_data_image);
   tmp_config_obj.set_vendor_image_path(FLAGS_vendor_image);
+  tmp_config_obj.set_metadata_image_path(FLAGS_metadata_image);
   tmp_config_obj.set_dtb_path(FLAGS_dtb);
   tmp_config_obj.set_gsi_fstab_path(FLAGS_gsi_fstab);
 
@@ -621,10 +629,13 @@
     exit(cvd::kCuttlefishConfigurationInitError);
   }
 
+  CreateBlankImage(FLAGS_metadata_image, FLAGS_blank_metadata_image_mb, "none");
+
   // Check that the files exist
   for (const auto& file :
        {config->system_image_path(), config->vendor_image_path(),
-        config->cache_image_path(), config->data_image_path()}) {
+        config->cache_image_path(), config->data_image_path(),
+        config->metadata_image_path()}) {
     if (!cvd::FileHasContent(file.c_str())) {
       LOG(ERROR) << "File not found: " << file;
       exit(cvd::kCuttlefishConfigurationInitError);