commit 3fad45042bd79abf1c0e68cc3403be39e5f0c537
author Jorge E. Moreira <jemoreira@google.com> Thu Feb 28 14:16:38 2019 -0800
committer Jorge E. Moreira <jemoreira@google.com> Thu Feb 28 14:16:38 2019 -0800
tree 1e4d193b9bf5dc0079b241b758393f19499479b4
parent fb01b7310183db6c68aa95eb8a0c405c72da787f

Make all disks R/W in crosvm command line

This fixes adb remount

Bug: 126764536
Test: run locally
Change-Id: Ia31638a453ebb5369911efa84fbb51418b006599

host/libs/vm_manager/crosvm_manager.cpp

diff --git a/host/libs/vm_manager/crosvm_manager.cpp b/host/libs/vm_manager/crosvm_manager.cpp
index 06d881e..110f934 100644
--- a/host/libs/vm_manager/crosvm_manager.cpp
+++ b/host/libs/vm_manager/crosvm_manager.cpp
@@ -77,10 +77,10 @@
   command.AddParameter("--mem=", config_->memory_mb());
   command.AddParameter("--cpus=", config_->cpus());
   command.AddParameter("--params=", config_->kernel_cmdline_as_string());
-  command.AddParameter("--disk=", config_->system_image_path());
+  command.AddParameter("--rwdisk=", config_->system_image_path());
   command.AddParameter("--rwdisk=", config_->data_image_path());
   command.AddParameter("--rwdisk=", config_->cache_image_path());
-  command.AddParameter("--disk=", config_->vendor_image_path());
+  command.AddParameter("--rwdisk=", config_->vendor_image_path());
   command.AddParameter("--socket=", GetControlSocketPath(config_));
   command.AddParameter("--android-fstab=", config_->gsi_fstab_path());