summaryrefslogtreecommitdiff
path: root/pkg/netns/netns_linux.go
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2019-08-06 09:49:03 -0500
committerbaude <bbaude@redhat.com>2019-08-06 09:51:38 -0500
commit97b84dedf3806a9e87c04ccfb51212992785d2c8 (patch)
treed3046e11b435900e041003c21b0e1e78383c8598 /pkg/netns/netns_linux.go
parent3bffe77f824772b841080ea463324f5ae5c833d4 (diff)
downloadpodman-97b84dedf3806a9e87c04ccfb51212992785d2c8.tar.gz
podman-97b84dedf3806a9e87c04ccfb51212992785d2c8.tar.bz2
podman-97b84dedf3806a9e87c04ccfb51212992785d2c8.zip
Revert "rootless: Rearrange setup of rootless containers"
This reverts commit 80dcd4bebcdc8e280f6b43228561d09c194c328b. Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/netns/netns_linux.go')
-rw-r--r--pkg/netns/netns_linux.go30
1 files changed, 3 insertions, 27 deletions
diff --git a/pkg/netns/netns_linux.go b/pkg/netns/netns_linux.go
index e8388055a..1d6fb873c 100644
--- a/pkg/netns/netns_linux.go
+++ b/pkg/netns/netns_linux.go
@@ -23,42 +23,23 @@ import (
"fmt"
"os"
"path"
- "path/filepath"
"runtime"
"strings"
"sync"
"github.com/containernetworking/plugins/pkg/ns"
- "github.com/containers/libpod/pkg/rootless"
- "github.com/containers/libpod/pkg/util"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
)
-// get NSRunDir returns the dir of where to create the netNS. When running
-// rootless, it needs to be at a location writable by user.
-func getNSRunDir() (string, error) {
- if rootless.IsRootless() {
- rootlessDir, err := util.GetRootlessRuntimeDir()
- if err != nil {
- return "", err
- }
- return filepath.Join(rootlessDir, "netns"), nil
- }
- return "/var/run/netns", nil
-}
+const nsRunDir = "/var/run/netns"
// 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
- }
-
b := make([]byte, 16)
- _, err = rand.Reader.Read(b)
+ _, err := rand.Reader.Read(b)
if err != nil {
return nil, fmt.Errorf("failed to generate random netns name: %v", err)
}
@@ -146,7 +127,7 @@ func NewNS() (ns.NetNS, error) {
// Put this thread back to the orig ns, since it might get reused (pre go1.10)
defer func() {
if err := origNS.Set(); err != nil {
- logrus.Warnf("unable to set namespace: %q", err)
+ logrus.Errorf("unable to set namespace: %q", err)
}
}()
@@ -169,11 +150,6 @@ func NewNS() (ns.NetNS, error) {
// UnmountNS unmounts the NS held by the netns object
func UnmountNS(ns ns.NetNS) error {
- nsRunDir, err := getNSRunDir()
- if err != nil {
- return err
- }
-
nsPath := ns.Path()
// Only unmount if it's been bind-mounted (don't touch namespaces in /proc...)
if strings.HasPrefix(nsPath, nsRunDir) {