Clean up unix vs linux usage

FreeBSD does not support cgroups or namespaces, which the code suggested, and is not supported in runc anyway right now. So clean up the file naming to use `_linux` where appropriate. Signed-off-by: Justin Cormack <[email protected]>
opencontainers · May 12, 2017 · 4c67360 · 4c67360
1 parent 21ef2e3
commit 4c67360
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 18 deletions.
diff --git a/libcontainer/configs/cgroup_unix.go → libcontainer/configs/cgroup_linux.go b/libcontainer/configs/cgroup_unix.go → libcontainer/configs/cgroup_linux.go
@@ -1,5 +1,3 @@
-// +build linux freebsd
-
 package configs
 
 type FreezerState string

diff --git a/libcontainer/configs/config_unix.go → libcontainer/configs/config_linux.go b/libcontainer/configs/config_unix.go → libcontainer/configs/config_linux.go
@@ -1,5 +1,3 @@
-// +build freebsd linux
-
 package configs
 
 import "fmt"

diff --git a/libcontainer/configs/config_unix_test.go → libcontainer/configs/config_linux_test.go b/libcontainer/configs/config_unix_test.go → libcontainer/configs/config_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux freebsd
-
 package configs
 
 import (

diff --git a/libcontainer/configs/namespaces_unix.go → libcontainer/configs/namespaces_linux.go b/libcontainer/configs/namespaces_unix.go → libcontainer/configs/namespaces_linux.go
@@ -1,5 +1,3 @@
-// +build linux freebsd
-
 package configs
 
 import (

diff --git a/libcontainer/configs/namespaces_unsupported.go b/libcontainer/configs/namespaces_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux,!freebsd
+// +build !linux
 
 package configs
 

diff --git a/libcontainer/criu_opts_unix.go → libcontainer/criu_opts_linux.go b/libcontainer/criu_opts_unix.go → libcontainer/criu_opts_linux.go
@@ -1,5 +1,3 @@
-// +build linux freebsd
-
 package libcontainer
 
 // cgroup restoring strategy provided by criu

diff --git a/libcontainer/devices/devices_unix.go → libcontainer/devices/devices_linux.go b/libcontainer/devices/devices_unix.go → libcontainer/devices/devices_linux.go
@@ -1,5 +1,3 @@
-// +build linux freebsd
-
 package devices
 
 import (

diff --git a/libcontainer/devices/devices_unsupported.go b/libcontainer/devices/devices_unsupported.go
@@ -1,3 +1,3 @@
-// +build windows
+// +build !linux
 
 package devices
diff --git a/main_unix.go → main_linux.go b/main_unix.go → main_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (

diff --git a/main_solaris.go b/main_solaris.go
@@ -1,5 +1,3 @@
-// +build solaris
-
 package main
 
 import "github.com/urfave/cli"