commit f70d12bf7f117d9b37d4888b869472f58a353708
author Greg Hartman <ghartman@google.com> Thu Jun 28 23:12:34 2018 -0700
committer Greg Hartman <ghartman@google.com> Mon Jul 23 21:34:41 2018 -0700
tree ee0868e410d4b50da07e6e8bb9f584b53f2b0b58
parent 7d303dde926be5a74269563d41f17924c2ba7e56

Drop 0-length ramdisks unconditionally

BUG: 110962084
Test: Local build dist and boot with modified crun
Change-Id: Id437120070b26635c3de9ab19c6b01aced002640
Merged-In: Id437120070b26635c3de9ab19c6b01aced002640
(cherry picked from commit d46a4c27ad8b2ee7a701c3314bf1977956a84eb8)

host/commands/launch/main.cc

diff --git a/host/commands/launch/main.cc b/host/commands/launch/main.cc
index 35c73d4..90bb752 100644
--- a/host/commands/launch/main.cc
+++ b/host/commands/launch/main.cc
@@ -455,10 +455,9 @@
   }
   if (FLAGS_initrd.empty()) {
     FLAGS_initrd = FLAGS_system_image_dir + "/ramdisk.img";
-    if (!FileHasContent(FLAGS_initrd.c_str())) {
-      LOG(WARNING) << "No ramdisk.img found; assuming system-as-root build";
-      FLAGS_initrd.clear();
-    }
+  }
+  if (!FileHasContent(FLAGS_initrd.c_str())) {
+    FLAGS_initrd.clear();
   }
   if (FLAGS_dtb.empty()) {
     if (FLAGS_initrd.empty()) {