diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-18 19:27:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 19:27:30 -0500 |
| commit | 7e286bc430ea50b72e972e48626298ac2e1f258a (patch) | |
| tree | 18520dac08ce1401bd183b976f5b01141810e3ae /pkg/netns | |
| parent | 797f1ea8cd0b7f4f85df4cf069bcd64c37a8ed1d (diff) | |
| parent | 24cc53cb5fa756a27a24b063b9372b8f8fd4348b (diff) | |
| download | podman-7e286bc430ea50b72e972e48626298ac2e1f258a.tar.gz podman-7e286bc430ea50b72e972e48626298ac2e1f258a.tar.bz2 podman-7e286bc430ea50b72e972e48626298ac2e1f258a.zip | |
Merge pull request #9427 from mheon/bump_301
Bump to v3.0.1
Diffstat (limited to 'pkg/netns')
| -rw-r--r-- | pkg/netns/netns_linux.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkg/netns/netns_linux.go b/pkg/netns/netns_linux.go index 6817a3abd..95b50e073 100644 --- a/pkg/netns/netns_linux.go +++ b/pkg/netns/netns_linux.go @@ -51,7 +51,6 @@ func getNSRunDir() (string, error) { // NewNS creates a new persistent (bind-mounted) network namespace and returns // an object representing that namespace, without switching to it. func NewNS() (ns.NetNS, error) { - nsRunDir, err := getNSRunDir() if err != nil { return nil, err @@ -92,7 +91,6 @@ func NewNS() (ns.NetNS, error) { if err != nil { return nil, fmt.Errorf("mount --make-rshared %s failed: %q", nsRunDir, err) } - } nsName := fmt.Sprintf("cni-%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:]) |