github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-16 07:05:14 +00:00
Code Issues Projects Releases Wiki Activity

kata_agent: send sandbox id in CreateSandbox request

Browse Source 
And do not append sandbox id to kernel arguments since that
would fail qemu args comparison in vm factory.

Fixes: #523

Signed-off-by: Peng Tao <bergwolf@gmail.com>
This commit is contained in:
Peng Tao 2018-07-27 10:51:38 +08:00
parent e69ebe5add
commit b200163de9
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
virtcontainers/kata_agent.go
View File

@ -584,6 +584,7 @@ func (k *kataAgent) startSandbox(sandbox *Sandbox) error {
Hostname: hostname, Hostname: hostname,
Storages: storages, Storages: storages,
SandboxPidns: sandbox.sharePidNs, SandboxPidns: sandbox.sharePidNs,
SandboxId: sandbox.id,
} }
_, err = k.sendReq(req) _, err = k.sendReq(req)

6
virtcontainers/qemu.go
View File

@ -400,14 +400,10 @@ func (q *qemu) createSandbox() error {
return err return err
} }
// Pass the sandbox name to the agent via the kernel command-line to
// allow the agent to use it in log messages.
params := q.kernelParameters() + " " + "agent.sandbox=" + q.id
kernel := govmmQemu.Kernel{ kernel := govmmQemu.Kernel{
Path: kernelPath, Path: kernelPath,
InitrdPath: initrdPath, InitrdPath: initrdPath,
Params: params, Params: q.kernelParameters(),
} }
incoming := q.setupTemplate(&knobs, &memory) incoming := q.setupTemplate(&knobs, &memory)