diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-07 15:06:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 15:06:17 -0500 |
| commit | 6c132b78f1338c01f60f0fd509710813e2832550 (patch) | |
| tree | 029911e38ed5dce8ae9fc33651425e1adff485a9 /libpod | |
| parent | 3cf41c4a7349d2f2529ce94801de2de9898ae27f (diff) | |
| parent | d9ebbbfe5b6a22e61091fe764ae2875aa0bf8064 (diff) | |
| download | podman-6c132b78f1338c01f60f0fd509710813e2832550.tar.gz podman-6c132b78f1338c01f60f0fd509710813e2832550.tar.bz2 podman-6c132b78f1338c01f60f0fd509710813e2832550.zip | |
Merge pull request #8771 from rhatdan/run
Switch references of /var/run -> /run
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/networking_linux.go | 2 | ||||
| -rw-r--r-- | libpod/options.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index be6867399..addf1814c 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -685,7 +685,7 @@ func (r *Runtime) setupNetNS(ctr *Container) error { return errors.Wrapf(err, "failed to generate random netns name") } - nsPath := fmt.Sprintf("/var/run/netns/cni-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:]) + nsPath := fmt.Sprintf("/run/netns/cni-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:]) if err := os.MkdirAll(filepath.Dir(nsPath), 0711); err != nil { return err diff --git a/libpod/options.go b/libpod/options.go index 8100eee62..ef7db3235 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -306,7 +306,7 @@ func WithDefaultMountsFile(mountsFile string) RuntimeOption { // WithTmpDir sets the directory that temporary runtime files which are not // expected to survive across reboots will be stored. -// This should be located on a tmpfs mount (/tmp or /var/run for example). +// This should be located on a tmpfs mount (/tmp or /run for example). func WithTmpDir(dir string) RuntimeOption { return func(rt *Runtime) error { if rt.valid { |