Commit ec70c0c3 authored by Nicholas Verne's avatar Nicholas Verne Committed by Commit Bot

Crostini's terminal passes cryptohome_id to vmshell.

This ensures that the underlying vsh implementation connects to the correct
VM via Concierge service. Another CL impelments the Concierge side of this
change.

Bug: 842561
Change-Id: I9d0f84cffd111e86760369c3f7d060580aef44b3
Reviewed-on: https://chromium-review.googlesource.com/1074803
Commit-Queue: Nicholas Verne <nverne@chromium.org>
Reviewed-by: default avatarTimothy Loh <timloh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563093}
parent db6ea3c0
......@@ -718,6 +718,10 @@ void CrostiniManager::LaunchContainerTerminal(
kCrostiniCroshBuiltinAppId);
std::string vm_name_param = net::EscapeQueryParamValue(
base::StringPrintf("--vm_name=%s", vm_name.c_str()), false);
std::string owner_id_param = net::EscapeQueryParamValue(
base::StringPrintf("--owner_id=%s",
CryptohomeIdForProfile(profile).c_str()),
false);
std::string lxd_dir =
net::EscapeQueryParamValue("LXD_DIR=/mnt/stateful/lxd", false);
std::string lxd_conf =
......@@ -726,17 +730,10 @@ void CrostiniManager::LaunchContainerTerminal(
extensions::ExtensionRegistry::Get(profile)->GetInstalledExtension(
kCrostiniCroshBuiltinAppId);
std::vector<base::StringPiece> pieces = {vsh_crosh,
vm_name_param,
"--",
lxd_dir,
lxd_conf,
"run_container.sh",
"--container_name",
container_name,
"--user",
container_username,
"--shell"};
std::vector<base::StringPiece> pieces = {
vsh_crosh, vm_name_param, owner_id_param, "--",
lxd_dir, lxd_conf, "run_container.sh", "--container_name",
container_name, "--user", container_username, "--shell"};
GURL vsh_in_crosh_url(base::JoinString(pieces, "&args[]="));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment