diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-22 20:05:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 20:05:58 +0000 |
| commit | 0d1fa2b50419236ee46b4daf0c0b6ea97deabcaa (patch) | |
| tree | ca92bc40d4a45c07fc1cb0ad0985f4a1a9011210 /libpod/networking_linux.go | |
| parent | ca26d44d3b8e1208dafd0e71caadc6b67ebb52b2 (diff) | |
| parent | aa4279ae151fa9df5245d3e255f3fb929fe2e86c (diff) | |
| download | podman-0d1fa2b50419236ee46b4daf0c0b6ea97deabcaa.tar.gz podman-0d1fa2b50419236ee46b4daf0c0b6ea97deabcaa.tar.bz2 podman-0d1fa2b50419236ee46b4daf0c0b6ea97deabcaa.zip | |
Merge pull request #14658 from eriksjolund/setup_to_set_up
"setup" -> "set up" and similar
Diffstat (limited to 'libpod/networking_linux.go')
| -rw-r--r-- | libpod/networking_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index cb1547a93..a83423c9f 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -291,7 +291,7 @@ func (r *RootlessNetNS) Do(toRun func() error) error { return err } -// Cleanup the rootless network namespace if needed. +// Clean up the rootless network namespace if needed. // It checks if we have running containers with the bridge network mode. // Cleanup() expects that r.Lock is locked func (r *RootlessNetNS) Cleanup(runtime *Runtime) error { @@ -783,7 +783,7 @@ func (r *Runtime) teardownNetwork(ns string, opts types.NetworkOptions) error { // execute the cni setup in the rootless net ns err = rootlessNetNS.Do(tearDownPod) if cerr := rootlessNetNS.Cleanup(r); cerr != nil { - logrus.WithError(err).Error("failed to cleanup rootless netns") + logrus.WithError(err).Error("failed to clean up rootless netns") } rootlessNetNS.Lock.Unlock() } else { |