commit 221c768c97d088bd81757885f63d70ff4aa5d339
author Kazuhiro Inaba <kinaba@google.com> Mon Jun 13 10:31:52 2022 +0900
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jun 20 05:26:22 2022 +0000
tree 14243fc111484f04982ce632b302e61b3421e454
parent d001bfb4b7fabb6f90c848e24c5e372f55301886

vm_tools: concierge: /usr/local/bin can be missing.

BUG=b:233835288
TEST=arc.Boot.vm on the test image without /usr/local/bin

Change-Id: I6c232566abbfb10f51a451d82fc12978b5327220
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3697692
Reviewed-by: Kansho Nishida <kansho@chromium.org>
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
(cherry picked from commit f1be58e883c67b02211afea10d2a68674108a8e5)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3706950
Commit-Queue: Ryo Hashimoto <hashimoto@chromium.org>

vm_tools/concierge/arc_vm.cc

diff --git a/vm_tools/concierge/arc_vm.cc b/vm_tools/concierge/arc_vm.cc
index bbbc2ce..ef7eccf 100644
--- a/vm_tools/concierge/arc_vm.cc
+++ b/vm_tools/concierge/arc_vm.cc
@@ -337,7 +337,13 @@
                                  "CHROMEOS_RELEASE_TRACK", &channel_string) &&
                              base::StartsWith(channel_string, "test");
   if (is_test_image) {
-    vm_builder.AppendSharedDir(shared_usr_local_bin);
+    if (base::PathExists(usr_local_bin_dir)) {
+      vm_builder.AppendSharedDir(shared_usr_local_bin);
+    } else {
+      // Powerwashing etc can delete the directory from test image device.
+      // We shouldn't abort ARCVM boot even under such an environment.
+      LOG(WARNING) << kUsrLocalBinSharedDir << " is missing on test image.";
+    }
   }
 
   if (custom_parameters.ObtainSpecialParameter(kKeyToOverrideODirect)