Merge pull request #261 from mavenugo/docker1.7.0_integ

Update netns to include support for PowerPC LE (ppc64le) architecture
This commit is contained in:
Madhu Venugopal
2015-06-05 14:22:36 -07:00
8 changed files with 23 additions and 7 deletions
+1 -1
View File
@@ -79,7 +79,7 @@
},
{
"ImportPath": "github.com/vishvananda/netns",
"Rev": "008d17ae001344769b031375bdb38a86219154c6"
"Rev": "5478c060110032f972e86a1f844fdb9a2f008f2c"
}
]
}
+1
View File
@@ -12,6 +12,7 @@ import (
"fmt"
"syscall"
)
// NsHandle is a handle to a network namespace. It can be cast directly
// to an int and used as a file descriptor.
type NsHandle int
+2
View File
@@ -1,3 +1,5 @@
// +build linux
package netns
import (
@@ -1,3 +1,5 @@
// +build linux,386
package netns
const (
@@ -1,3 +1,5 @@
// +build linux,amd64
package netns
const (
@@ -1,3 +1,5 @@
// +build linux,arm
package netns
const (
@@ -0,0 +1,7 @@
// +build linux,ppc64le
package netns
const (
SYS_SETNS = 350
)
+6 -6
View File
@@ -10,26 +10,26 @@ var (
ErrNotImplemented = errors.New("not implemented")
)
func Set(ns Namespace) (err error) {
func Set(ns NsHandle) (err error) {
return ErrNotImplemented
}
func New() (ns Namespace, err error) {
func New() (ns NsHandle, err error) {
return -1, ErrNotImplemented
}
func Get() (Namespace, error) {
func Get() (NsHandle, error) {
return -1, ErrNotImplemented
}
func GetFromName(name string) (Namespace, error) {
func GetFromName(name string) (NsHandle, error) {
return -1, ErrNotImplemented
}
func GetFromPid(pid int) (Namespace, error) {
func GetFromPid(pid int) (NsHandle, error) {
return -1, ErrNotImplemented
}
func GetFromDocker(id string) (Namespace, error) {
func GetFromDocker(id string) (NsHandle, error) {
return -1, ErrNotImplemented
}