BACKPORT: Always save own namespace paths

Fix https://bugzilla.redhat.com/show_bug.cgi?id=1510573 Upstream reference: opencontainers/runc#1477 Signed-off-by: Antonio Murdaca <runcom@redhat.com>
projectatomic · Nov 12, 2017 · 076620e · 076620e
1 parent c5d3116
commit 076620e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/libcontainer/configs/namespaces_unix.go b/libcontainer/configs/namespaces_unix.go
@@ -81,9 +81,6 @@ type Namespace struct {
 }
 
 func (n *Namespace) GetPath(pid int) string {
-	if n.Path != "" {
-		return n.Path
-	}
 	return fmt.Sprintf("/proc/%d/ns/%s", pid, nsToFile(n.Type))
 }
 

diff --git a/libcontainer/container_linux_test.go b/libcontainer/container_linux_test.go
@@ -134,7 +134,7 @@ func TestGetContainerState(t *testing.T) {
 	var (
 		pid                 = os.Getpid()
 		expectedMemoryPath  = "/sys/fs/cgroup/memory/myid"
-		expectedNetworkPath = "/networks/fd"
+		expectedNetworkPath = fmt.Sprintf("/proc/%d/ns/net", pid)
 	)
 	container := &linuxContainer{
 		id: "myid",