diff options
author | Peter Hunt <pehunt@redhat.com> | 2019-10-21 17:04:27 -0400 |
---|---|---|
committer | Peter Hunt <pehunt@redhat.com> | 2019-10-21 17:04:27 -0400 |
commit | 06850ea2c060ef8d262a5a2841f68b2d2c7a6633 (patch) | |
tree | 756f19a8a049248037377f6a9559a426d2e48e04 | |
parent | f0da9cfc26158098c2f63dbba7fe33fd4af800aa (diff) | |
download | podman-06850ea2c060ef8d262a5a2841f68b2d2c7a6633.tar.gz podman-06850ea2c060ef8d262a5a2841f68b2d2c7a6633.tar.bz2 podman-06850ea2c060ef8d262a5a2841f68b2d2c7a6633.zip |
exec: remove unused var
Signed-off-by: Peter Hunt <pehunt@redhat.com>
-rw-r--r-- | libpod/oci_conmon_linux.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 658a2fe4e..448e05bdf 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -602,7 +602,7 @@ func (r *ConmonOCIRuntime) ExecContainer(c *Container, sessionID string, options if err != nil { return -1, nil, errors.Wrapf(err, "cannot start container %s", c.ID()) } - if err := r.moveConmonToCgroupAndSignal(c, execCmd, parentStartPipe, sessionID); err != nil { + if err := r.moveConmonToCgroupAndSignal(c, execCmd, parentStartPipe); err != nil { return -1, nil, err } @@ -986,7 +986,7 @@ func (r *ConmonOCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Co if err != nil { return err } - if err := r.moveConmonToCgroupAndSignal(ctr, cmd, parentStartPipe, ctr.ID()); err != nil { + if err := r.moveConmonToCgroupAndSignal(ctr, cmd, parentStartPipe); err != nil { return err } /* Wait for initial setup and fork, and reap child */ @@ -1213,7 +1213,7 @@ func startCommandGivenSelinux(cmd *exec.Cmd) error { // moveConmonToCgroupAndSignal gets a container's cgroupParent and moves the conmon process to that cgroup // it then signals for conmon to start by sending nonse data down the start fd -func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec.Cmd, startFd *os.File, uuid string) error { +func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec.Cmd, startFd *os.File) error { mustCreateCgroup := true // If cgroup creation is disabled - just signal. if ctr.config.NoCgroups { |