mirror of
https://github.com/aljazceru/kata-containers.git
synced 2025-12-22 16:54:25 +01:00
kata_agent: send sandbox id in CreateSandbox request
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:
@@ -584,6 +584,7 @@ func (k *kataAgent) startSandbox(sandbox *Sandbox) error {
|
||||
Hostname: hostname,
|
||||
Storages: storages,
|
||||
SandboxPidns: sandbox.sharePidNs,
|
||||
SandboxId: sandbox.id,
|
||||
}
|
||||
|
||||
_, err = k.sendReq(req)
|
||||
|
||||
@@ -400,14 +400,10 @@ func (q *qemu) createSandbox() error {
|
||||
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{
|
||||
Path: kernelPath,
|
||||
InitrdPath: initrdPath,
|
||||
Params: params,
|
||||
Params: q.kernelParameters(),
|
||||
}
|
||||
|
||||
incoming := q.setupTemplate(&knobs, &memory)
|
||||
|
||||
Reference in New Issue
Block a user