Utilize crosvm's new --initrd feature
am: 73427de608
Change-Id: I24b5d8d5836cca01ca868c0bcb1b9138491a64b6
diff --git a/host/libs/vm_manager/crosvm_manager.cpp b/host/libs/vm_manager/crosvm_manager.cpp
index 1605931..f4243a7 100644
--- a/host/libs/vm_manager/crosvm_manager.cpp
+++ b/host/libs/vm_manager/crosvm_manager.cpp
@@ -57,12 +57,6 @@
: VmManager(config) {}
cvd::Command CrosvmManager::StartCommand() {
- if (!config_->ramdisk_image_path().empty()) {
- // TODO re-enable ramdisk when crosvm supports it
- LOG(FATAL) << "initramfs not supported";
- return cvd::Command("/bin/false");
- }
-
// TODO Add aarch64 support
// TODO Add the tap interfaces (--tap-fd)
// TODO Redirect logcat output
@@ -74,6 +68,9 @@
cvd::Command command(config_->crosvm_binary());
command.AddParameter("run");
+ if (!config_->ramdisk_image_path().empty()) {
+ command.AddParameter("--initrd=", config_->ramdisk_image_path());
+ }
command.AddParameter("--null-audio");
command.AddParameter("--mem=", config_->memory_mb());
command.AddParameter("--cpus=", config_->cpus());
@@ -134,3 +131,4 @@
}
} // namespace vm_manager
+