diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-05 05:56:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 05:56:46 -0800 |
| commit | 85b116707bf84125f00c3bf39e28ef33a7d49066 (patch) | |
| tree | 73411249df3fecb0ccc41dc1978af67242cc976a /libpod/container_api.go | |
| parent | 4b80517b6a638ff06f8ad432f0f0f5839283d058 (diff) | |
| parent | 0b34327ad40e04861dac7f73870d87633a5c637e (diff) | |
| download | podman-85b116707bf84125f00c3bf39e28ef33a7d49066.tar.gz podman-85b116707bf84125f00c3bf39e28ef33a7d49066.tar.bz2 podman-85b116707bf84125f00c3bf39e28ef33a7d49066.zip | |
Merge pull request #2426 from giuseppe/exec-preserve-fds
exec: support --preserve-fds
Diffstat (limited to 'libpod/container_api.go')
| -rw-r--r-- | libpod/container_api.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 6bef3c47d..4a76e1434 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -204,7 +204,7 @@ func (c *Container) Kill(signal uint) error { // Exec starts a new process inside the container // TODO investigate allowing exec without attaching -func (c *Container) Exec(tty, privileged bool, env, cmd []string, user, workDir string, streams *AttachStreams) error { +func (c *Container) Exec(tty, privileged bool, env, cmd []string, user, workDir string, streams *AttachStreams, preserveFDs int) error { var capList []string locked := false @@ -266,7 +266,7 @@ func (c *Container) Exec(tty, privileged bool, env, cmd []string, user, workDir logrus.Debugf("Creating new exec session in container %s with session id %s", c.ID(), sessionID) - execCmd, err := c.runtime.ociRuntime.execContainer(c, cmd, capList, env, tty, workDir, hostUser, sessionID, streams) + execCmd, err := c.runtime.ociRuntime.execContainer(c, cmd, capList, env, tty, workDir, hostUser, sessionID, streams, preserveFDs) if err != nil { return errors.Wrapf(err, "error exec %s", c.ID()) } |