Merge pull request opencontainers#1447 from justincormack/unix-linux

crosbymichael · web-flow · commit c1287819af73 · 2017-05-12T10:25:45.000-07:00
Clean up unix vs linux usage
diff --git a/libcontainer/configs/cgroup_linux.go b/libcontainer/configs/cgroup_linux.go
@@ -1,5 +1,3 @@
-// +build linux freebsd
-
 package configs
 
 type FreezerState string
diff --git a/libcontainer/configs/config_linux.go b/libcontainer/configs/config_linux.go
@@ -1,5 +1,3 @@
-// +build freebsd linux
-
 package configs
 
 import "fmt"
diff --git a/libcontainer/configs/config_linux_test.go b/libcontainer/configs/config_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux freebsd
-
 package configs
 
 import (
diff --git a/libcontainer/configs/namespaces_linux.go b/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_linux.go b/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_linux.go b/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_linux.go b/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"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build linux freebsd`
`2`		`-`
`3`	`1`	`package configs`
`4`	`2`
`5`	`3`	`type FreezerState string`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build freebsd linux`
`2`		`-`
`3`	`1`	`package configs`
`4`	`2`
`5`	`3`	`import "fmt"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build !linux,!freebsd`
	`1`	`+// +build !linux`
`2`	`2`
`3`	`3`	`package configs`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build linux freebsd`
`2`		`-`
`3`	`1`	`package libcontainer`
`4`	`2`
`5`	`3`	`// cgroup restoring strategy provided by criu`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build linux freebsd`
`2`		`-`
`3`	`1`	`package devices`
`4`	`2`
`5`	`3`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-// +build windows`
	`1`	`+// +build !linux`
`2`	`2`
`3`	`3`	`package devices`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build linux`
`2`		`-`
`3`	`1`	`package main`
`4`	`2`
`5`	`3`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build solaris`
`2`		`-`
`3`	`1`	`package main`
`4`	`2`
`5`	`3`	`import "github.com/urfave/cli"`