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 /pkg/netns | |
| 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 'pkg/netns')
| -rw-r--r-- | pkg/netns/netns_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/netns/netns_linux.go b/pkg/netns/netns_linux.go index ed5241632..6817a3abd 100644 --- a/pkg/netns/netns_linux.go +++ b/pkg/netns/netns_linux.go @@ -45,7 +45,7 @@ func getNSRunDir() (string, error) { } return filepath.Join(rootlessDir, "netns"), nil } - return "/var/run/netns", nil + return "/run/netns", nil } // NewNS creates a new persistent (bind-mounted) network namespace and returns @@ -80,7 +80,7 @@ func NewNS() (ns.NetNS, error) { return nil, fmt.Errorf("mount --make-rshared %s failed: %q", nsRunDir, err) } - // Recursively remount /var/run/netns on itself. The recursive flag is + // Recursively remount /run/netns on itself. The recursive flag is // so that any existing netns bindmounts are carried over. err = unix.Mount(nsRunDir, nsRunDir, "none", unix.MS_BIND|unix.MS_REC, "") if err != nil { |