summaryrefslogtreecommitdiffhomepage
path: root/runsc/cmd
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-07-13 00:04:49 +0000
committergVisor bot <gvisor-bot@google.com>2021-07-13 00:04:49 +0000
commit289efe127e1f04f4fbb0c2a46050a6cd9c9f3b9b (patch)
treef7ce0ad39816552e9a359e749e04dd00dbe8b9b7 /runsc/cmd
parent158f028c96c3bf8a683bbc98ccf23c546cc7b326 (diff)
parent275932bf0852431b6f307ba9c45f26073d20ac62 (diff)
Merge release-20210705.0-14-g275932bf0 (automated)
Diffstat (limited to 'runsc/cmd')
-rw-r--r--runsc/cmd/exec.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/runsc/cmd/exec.go b/runsc/cmd/exec.go
index 242d474b8..2139fdf53 100644
--- a/runsc/cmd/exec.go
+++ b/runsc/cmd/exec.go
@@ -146,12 +146,12 @@ func (ex *Exec) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
if ex.detach {
return ex.execChildAndWait(waitStatus)
}
- return ex.exec(c, e, waitStatus)
+ return ex.exec(conf, c, e, waitStatus)
}
-func (ex *Exec) exec(c *container.Container, e *control.ExecArgs, waitStatus *unix.WaitStatus) subcommands.ExitStatus {
+func (ex *Exec) exec(conf *config.Config, c *container.Container, e *control.ExecArgs, waitStatus *unix.WaitStatus) subcommands.ExitStatus {
// Start the new process and get its pid.
- pid, err := c.Execute(e)
+ pid, err := c.Execute(conf, e)
if err != nil {
return Errorf("executing processes for container: %v", err)
}