aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Delva <adelva@google.com>2021-12-14 00:27:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-14 00:27:03 +0000
commitcb6485f5086e0fbfa080c243cba3e0eb2060a098 (patch)
treeec1f6d9268e9252569f83690e34b7b9174e8f07a
parentd689eb6a70cd7e26f77e90cf60e2c89d82342ac7 (diff)
parent95bcc66fdba9e9587295973dbf8ecfface9c272d (diff)
downloadcuttlefish-temp_sam_210511427.tar.gz
Merge "Temporarily disable virtiofs" am: 95bcc66fdbtemp_sam_210511427
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/1918761 Change-Id: I4e92710eaeca65f59cbd4853faf5a0121ce0348a
-rw-r--r--host/libs/vm_manager/crosvm_manager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/libs/vm_manager/crosvm_manager.cpp b/host/libs/vm_manager/crosvm_manager.cpp
index 485f3cef6..64c2b1f8f 100644
--- a/host/libs/vm_manager/crosvm_manager.cpp
+++ b/host/libs/vm_manager/crosvm_manager.cpp
@@ -327,7 +327,7 @@ std::vector<Command> CrosvmManager::StartCommands(
}
// TODO(b/162071003): virtiofs crashes without sandboxing, this should be fixed
- if (config.enable_sandbox()) {
+ if (0 && config.enable_sandbox()) {
// Set up directory shared with virtiofs
crosvm_cmd.Cmd().AddParameter(
"--shared-dir=", instance.PerInstancePath(kSharedDirName),