Skip to content

Commit 3875be9

Browse files
author
John Howard
committed
Windows: Tidy up daemon\utils*.go
Signed-off-by: John Howard <[email protected]>
1 parent 4893ecc commit 3875be9

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

daemon/utils_linux.go

Lines changed: 0 additions & 17 deletions
This file was deleted.

daemon/utils_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// +build linux
2+
13
package daemon
24

35
import (

daemon/utils.go renamed to daemon/utils_unix.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// +build linux
2+
13
package daemon
24

35
import (
@@ -6,8 +8,21 @@ import (
68
"strings"
79

810
"github.com/docker/docker/runconfig"
11+
"github.com/docker/libcontainer/selinux"
912
)
1013

14+
func selinuxSetDisabled() {
15+
selinux.SetDisabled()
16+
}
17+
18+
func selinuxFreeLxcContexts(label string) {
19+
selinux.FreeLxcContexts(label)
20+
}
21+
22+
func selinuxEnabled() bool {
23+
return selinux.SelinuxEnabled()
24+
}
25+
1126
func mergeLxcConfIntoOptions(hostConfig *runconfig.HostConfig) ([]string, error) {
1227
if hostConfig == nil {
1328
return nil, nil

0 commit comments

Comments
 (0)