kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #14516 from Microsoft/10662-mergeLXCconf

Browse source 
Windows: Tidy up daemon\utils*.go
This commit is contained in:
Alexander Morozov 2015-07-13 14:47:25 -06:00
commit c2b9fa8c9a
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
daemon/utils_linux.go
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()
}

0
daemon/utils_nolinux.go → daemon/utils_nounix.go
View file

2
daemon/utils_test.go
View file

@ -1,3 +1,5 @@
// +build linux
package daemon
import (

15
daemon/utils.go → daemon/utils_unix.go
View file

@ -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