diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-22 02:08:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 02:08:01 +0200 |
| commit | 5431aceb0a12e2dededa55a308fc4d6e13c63242 (patch) | |
| tree | 1c4ed572875e2bc281b1f23ed759bb36a1d08c9e | |
| parent | efc54c3987f95fd94b5e0aa41dd307be49d1b31b (diff) | |
| parent | 06850ea2c060ef8d262a5a2841f68b2d2c7a6633 (diff) | |
| download | podman-5431aceb0a12e2dededa55a308fc4d6e13c63242.tar.gz podman-5431aceb0a12e2dededa55a308fc4d6e13c63242.tar.bz2 podman-5431aceb0a12e2dededa55a308fc4d6e13c63242.zip | |
Merge pull request #4313 from haircommander/unused-var
exec: remove unused var
| -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 { |