Windows: Tidy up daemon\utils*.go

Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3875be9830af55731251cd3d98d71e7fdb73f223
Component: engine
This commit is contained in:
John Howard
2015-07-09 18:47:32 -07:00
parent 01e9709b3d
commit ea5024ff23
4 changed files with 17 additions and 17 deletions
-17
View File
@@ -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()
}
+2
View File
@@ -1,3 +1,5 @@
// +build linux
package daemon
import (
@@ -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