commit cb747acff0653679b81f043df8bade08e73be876
author Vickie Cheng <vickiecheng@google.com> Wed Jan 16 15:26:19 2019 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Thu Jan 17 23:29:44 2019 +0000
tree d3ed831b2e418f65d23dd167136dce6de8603862
parent e02851c5cf2c5258ce47a0bc3713db1600ae6046

[sessionctl] Look for basemgr debug service in additional path for virtcon sessions

TEST=launched sessionctl in virtcon
MF-169 #comment Look for basemgr debug service in additional path for virtcon sessions

Change-Id: Icd1641aa716d66ceb56ecf03ef32ec7225771ee3

bin/sessionctl/main.cc

diff --git a/bin/sessionctl/main.cc b/bin/sessionctl/main.cc
index 4b387ef..ce19a09 100644
--- a/bin/sessionctl/main.cc
+++ b/bin/sessionctl/main.cc
@@ -145,19 +145,23 @@
 }
 
 fuchsia::modular::internal::BasemgrDebugPtr ConnectToBasemgr() {
-  fuchsia::modular::internal::BasemgrDebugPtr basemgr;
-  auto request = basemgr.NewRequest().TakeChannel();
-
+  const char kRegex[] = "/basemgr.cmx/(\\d+)";
   std::vector<DebugService> services;
-  FindDebugServicesForPath(modular::kBasemgrDebugServiceGlobPath, "basemgr.cmx",
+  FindDebugServicesForPath(modular::kBasemgrDebugServiceGlobPath, kRegex,
                            &services);
 
+  // Path to basemgr debug service from a virtual console
+  FindDebugServicesForPath("/hub/r/sys/*/c/basemgr.cmx/*/out/debug/basemgr",
+                           kRegex, &services);
+
   if (services.empty()) {
     return nullptr;
   }
   FXL_CHECK(services.size() == 1);
-
   std::string service_path = services[0].service_path;
+
+  fuchsia::modular::internal::BasemgrDebugPtr basemgr;
+  auto request = basemgr.NewRequest().TakeChannel();
   if (fdio_service_connect(service_path.c_str(), request.get()) != ZX_OK) {
     FXL_LOG(FATAL) << "Could not connect to basemgr service in "
                    << service_path;