From 3875be9830af55731251cd3d98d71e7fdb73f223 Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 9 Jul 2015 18:47:32 -0700 Subject: [PATCH] Windows: Tidy up daemon\utils*.go Signed-off-by: John Howard --- daemon/utils_linux.go | 17 ----------------- daemon/{utils_nolinux.go => utils_nounix.go} | 0 daemon/utils_test.go | 2 ++ daemon/{utils.go => utils_unix.go} | 15 +++++++++++++++ 4 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 daemon/utils_linux.go rename daemon/{utils_nolinux.go => utils_nounix.go} (100%) rename daemon/{utils.go => utils_unix.go} (75%) diff --git a/daemon/utils_linux.go b/daemon/utils_linux.go deleted file mode 100644 index fb35152f0d..0000000000 --- a/daemon/utils_linux.go +++ /dev/null @@ -1,17 +0,0 @@ -// +build linux - -package daemon - -import "github.com/docker/libcontainer/selinux" - -func selinuxSetDisabled() { - selinux.SetDisabled() -} - -func selinuxFreeLxcContexts(label string) { - selinux.FreeLxcContexts(label) -} - -func selinuxEnabled() bool { - return selinux.SelinuxEnabled() -} diff --git a/daemon/utils_nolinux.go b/daemon/utils_nounix.go similarity index 100% rename from daemon/utils_nolinux.go rename to daemon/utils_nounix.go diff --git a/daemon/utils_test.go b/daemon/utils_test.go index f81843847c..99165f7810 100644 --- a/daemon/utils_test.go +++ b/daemon/utils_test.go @@ -1,3 +1,5 @@ +// +build linux + package daemon import ( diff --git a/daemon/utils.go b/daemon/utils_unix.go similarity index 75% rename from daemon/utils.go rename to daemon/utils_unix.go index 1dbffb6812..6b871b1503 100644 --- a/daemon/utils.go +++ b/daemon/utils_unix.go @@ -1,3 +1,5 @@ +// +build linux + package daemon import ( @@ -6,8 +8,21 @@ import ( "strings" "github.com/docker/docker/runconfig" + "github.com/docker/libcontainer/selinux" ) +func selinuxSetDisabled() { + selinux.SetDisabled() +} + +func selinuxFreeLxcContexts(label string) { + selinux.FreeLxcContexts(label) +} + +func selinuxEnabled() bool { + return selinux.SelinuxEnabled() +} + func mergeLxcConfIntoOptions(hostConfig *runconfig.HostConfig) ([]string, error) { if hostConfig == nil { return nil, nil