summaryrefslogtreecommitdiff
path: root/pkg/netns/netns_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-02-12 11:30:00 -0500
committerGitHub <noreply@github.com>2021-02-12 11:30:00 -0500
commit291f59600b7857bbec6f340d3ceec6e2e9ce923f (patch)
tree401aaa4e56cbe585582fa1124a9cd77a83ae21a9 /pkg/netns/netns_linux.go
parent1b284a298c0bde20561321f325d4a7ad00e7bd25 (diff)
parent78c8a87362ee27ba1d2a62b7c9d73adc313c7d7e (diff)
downloadpodman-291f59600b7857bbec6f340d3ceec6e2e9ce923f.tar.gz
podman-291f59600b7857bbec6f340d3ceec6e2e9ce923f.tar.bz2
podman-291f59600b7857bbec6f340d3ceec6e2e9ce923f.zip
Merge pull request #9331 from Luap99/lint
Enable more golangci-lint linters
Diffstat (limited to 'pkg/netns/netns_linux.go')
-rw-r--r--pkg/netns/netns_linux.go2
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:])