Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up unix vs linux usage #1447

Merged
merged 1 commit into from
May 12, 2017
Merged

Clean up unix vs linux usage #1447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions libcontainer/configs/cgroup_unix.go → libcontainer/configs/cgroup_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build linux freebsd

package configs

type FreezerState string
Expand Down
2 changes: 0 additions & 2 deletions libcontainer/configs/config_unix.go → libcontainer/configs/config_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build freebsd linux

package configs

import "fmt"
Expand Down
2 changes: 0 additions & 2 deletions libcontainer/configs/config_unix_test.go → libcontainer/configs/config_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build linux freebsd

package configs

import (
Expand Down
2 changes: 0 additions & 2 deletions libcontainer/configs/namespaces_unix.go → libcontainer/configs/namespaces_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build linux freebsd

package configs

import (
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/configs/namespaces_unsupported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !linux,!freebsd
// +build !linux

package configs

Expand Down
2 changes: 0 additions & 2 deletions libcontainer/criu_opts_unix.go → libcontainer/criu_opts_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build linux freebsd

package libcontainer

// cgroup restoring strategy provided by criu
Expand Down
2 changes: 0 additions & 2 deletions libcontainer/devices/devices_unix.go → libcontainer/devices/devices_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build linux freebsd

package devices

import (
Expand Down
2 changes: 1 addition & 1 deletion libcontainer/devices/devices_unsupported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// +build windows
// +build !linux

package devices
2 changes: 0 additions & 2 deletions main_unix.go → main_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build linux

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions main_solaris.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build solaris

package main

import "github.com/urfave/cli"
Expand Down