diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-29 07:48:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 07:48:12 -0700 |
| commit | 284dea453d77f524c400e6c26812828d8a7439c7 (patch) | |
| tree | 084ae250cffdf7090b984c2f88d8b033dd93657c /libpod/oci.go | |
| parent | 83cea5d5bc6af51cd7df66a34c80af0080d37ba6 (diff) | |
| parent | ca38ca49b8f9c670e3d8a4da1a43a357c83f3f50 (diff) | |
| download | podman-284dea453d77f524c400e6c26812828d8a7439c7.tar.gz podman-284dea453d77f524c400e6c26812828d8a7439c7.tar.bz2 podman-284dea453d77f524c400e6c26812828d8a7439c7.zip | |
Merge pull request #2797 from giuseppe/rootless-set-sticky
rootless: set sticky bit on rundir
Diffstat (limited to 'libpod/oci.go')
| -rw-r--r-- | libpod/oci.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index b25175b9d..62331b879 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -473,7 +473,7 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res // If useRunc is false, we will not directly hit runc to see the container's // status, but will instead only check for the existence of the conmon exit file // and update state to stopped if it exists. -func (r *OCIRuntime) updateContainerStatus(ctr *Container, useRunc bool) error { +func (r *OCIRuntime) updateContainerStatus(ctr *Container, useRuntime bool) error { exitFile := ctr.exitFilePath() runtimeDir, err := util.GetRootlessRuntimeDir() @@ -481,8 +481,8 @@ func (r *OCIRuntime) updateContainerStatus(ctr *Container, useRunc bool) error { return err } - // If not using runc, we don't need to do most of this. - if !useRunc { + // If not using the OCI runtime, we don't need to do most of this. + if !useRuntime { // If the container's not running, nothing to do. if ctr.state.State != ContainerStateRunning && ctr.state.State != ContainerStatePaused { return nil |