Skip to content

Commit

Permalink
Fix cross compile for network and node pkgs
Browse files Browse the repository at this point in the history
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
  • Loading branch information
Michael Crosby committed Jun 23, 2014
1 parent 626420b commit d2c7999
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 2 deletions.
4 changes: 3 additions & 1 deletion mount/nodes/nodes_unsupported.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
package nodes

import (
"errors"

"github.com/docker/libcontainer/devices"
)

func CreateDeviceNodes(rootfs string, nodesToCreate []*devices.Device) error {
return ErrUnsupported
return errors.New("Unsupported method")
}
1 change: 1 addition & 0 deletions namespaces/unsupported.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package namespaces

import (
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/cgroups"
)

Expand Down
2 changes: 2 additions & 0 deletions network/loopback.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build linux

package network

import (
Expand Down
2 changes: 2 additions & 0 deletions network/netns.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build linux

package network

import (
Expand Down
5 changes: 4 additions & 1 deletion network/network.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
// +build linux

package network

import (
"github.com/docker/libcontainer/netlink"
"net"

"github.com/docker/libcontainer/netlink"
)

func InterfaceUp(name string) error {
Expand Down
2 changes: 2 additions & 0 deletions network/strategy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build linux

package network

import (
Expand Down
2 changes: 2 additions & 0 deletions network/veth.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build linux

package network

import (
Expand Down

0 comments on commit d2c7999

Please sign in to comment.