diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-22 09:29:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-22 09:29:28 -0400 |
| commit | 21c77846e4b441d1da4a27a416c2f4dcd8e68cff (patch) | |
| tree | 240e96a556c3612b538a2c1bbc04c410e81f857f /libpod/container_internal.go | |
| parent | a67aec72eda161876b9ba6d4d31af0d7de8fc824 (diff) | |
| parent | e356160f415b6111df09af214f0dea299e78ad04 (diff) | |
| download | podman-21c77846e4b441d1da4a27a416c2f4dcd8e68cff.tar.gz podman-21c77846e4b441d1da4a27a416c2f4dcd8e68cff.tar.bz2 podman-21c77846e4b441d1da4a27a416c2f4dcd8e68cff.zip | |
Merge pull request #9495 from rhatdan/groups
Add '--group-add keep-groups': supplementary groups into container
Diffstat (limited to 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 041fa13e7..80c00a622 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -1313,7 +1313,7 @@ func (c *Container) stop(timeout uint) error { } // We have to check stopErr *after* we lock again - otherwise, we have a - // change of panicing on a double-unlock. Ref: GH Issue 9615 + // change of panicking on a double-unlock. Ref: GH Issue 9615 if stopErr != nil { return stopErr } @@ -1676,7 +1676,7 @@ func (c *Container) chownVolume(volumeName string) error { // TODO: For now, I've disabled chowning volumes owned by non-Podman // drivers. This may be safe, but it's really going to be a case-by-case - // thing, I think - safest to leave disabled now and reenable later if + // thing, I think - safest to leave disabled now and re-enable later if // there is a demand. if vol.state.NeedsChown && !vol.UsesVolumeDriver() { vol.state.NeedsChown = false |