--selinux-enabled flag should be ignored on Disabled SELinux systems

rhatdan · rhatdan · commit 9e2eb0f1cc3c · 2014-09-23T13:21:25.000-04:00
On Fedora and RHEL we ship selinux-enabled flag in the docker.service config,
but if people setup the /var/lib/docker as btrfs and disable SELinux,
we should not block the daemon from running.

Docker-DCO-1.1-Signed-off-by: Dan Walsh &lt;dwalsh@redhat.com&gt; (github: rhatdan)
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -775,7 +775,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
 	log.Debugf("Using graph driver %s", driver)
 
 	// 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!")
 	}
 
diff --git a/daemon/utils_linux.go b/daemon/utils_linux.go
@@ -11,3 +11,7 @@ func selinuxSetDisabled() {
 func selinuxFreeLxcContexts(label string) {
 	selinux.FreeLxcContexts(label)
 }
+
+func selinuxEnabled() bool {
+	return selinux.SelinuxEnabled()
+}
diff --git a/daemon/utils_nolinux.go b/daemon/utils_nolinux.go
@@ -7,3 +7,7 @@ func selinuxSetDisabled() {
 
 func selinuxFreeLxcContexts(label string) {
 }
+
+func selinuxEnabled() bool {
+	return false
+}

Original file line number	Diff line number	Diff line change
`@@ -775,7 +775,7 @@ func NewDaemonFromDirectory(config Config, eng engine.Engine) (*Daemon, error)`
`775`	`775`	`log.Debugf("Using graph driver %s", driver)`
`776`	`776`
`777`	`777`	`// As Docker on btrfs and SELinux are incompatible at present, error on both being enabled`
`778`		`- if config.EnableSelinuxSupport && driver.String() == "btrfs" {`
	`778`	`+ if selinuxEnabled() && config.EnableSelinuxSupport && driver.String() == "btrfs" {`
`779`	`779`	`return nil, fmt.Errorf("SELinux is not supported with the BTRFS graph driver!")`
`780`	`780`	`}`
`781`	`781`
Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,7 @@ func selinuxSetDisabled() {`
`11`	`11`	`func selinuxFreeLxcContexts(label string) {`
`12`	`12`	`selinux.FreeLxcContexts(label)`
`13`	`13`	`}`
	`14`	`+`
	`15`	`+func selinuxEnabled() bool {`
	`16`	`+ return selinux.SelinuxEnabled()`
	`17`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,3 +7,7 @@ func selinuxSetDisabled() {`
`7`	`7`
`8`	`8`	`func selinuxFreeLxcContexts(label string) {`
`9`	`9`	`}`
	`10`	`+`
	`11`	`+func selinuxEnabled() bool {`
	`12`	`+ return false`
	`13`	`+}`