docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8181 from rhatdan/selinux_btrfs 

--selinux-enabled flag should be ignored on Disabled SELinux systems
This commit is contained in:
Victor Vieux 2014-09-23 10:31:19 -07:00
parent 437fa0650e 9e2eb0f1cc
commit f2bc723bc6
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/daemon.go
View File

@ -775,7 +775,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
log.Debugf("Using graph driver %s", driver) log.Debugf("Using graph driver %s", driver)
// As Docker on btrfs and SELinux are incompatible at present, error on both being enabled // As Docker on btrfs and SELinux are incompatible at present, error on both being enabled
if config.EnableSelinuxSupport && driver.String() == "btrfs" { if selinuxEnabled() && config.EnableSelinuxSupport && driver.String() == "btrfs" {
return nil, fmt.Errorf("SELinux is not supported with the BTRFS graph driver!") return nil, fmt.Errorf("SELinux is not supported with the BTRFS graph driver!")
} }

4
daemon/utils_linux.go
View File

@ -11,3 +11,7 @@ func selinuxSetDisabled() {
func selinuxFreeLxcContexts(label string) { func selinuxFreeLxcContexts(label string) {
selinux.FreeLxcContexts(label) selinux.FreeLxcContexts(label)
} }
func selinuxEnabled() bool {
return selinux.SelinuxEnabled()
}

4
daemon/utils_nolinux.go
View File

@ -7,3 +7,7 @@ func selinuxSetDisabled() {
func selinuxFreeLxcContexts(label string) { func selinuxFreeLxcContexts(label string) {
} }
func selinuxEnabled() bool {
return false
}