浏览代码

Merge pull request #8181 from rhatdan/selinux_btrfs

--selinux-enabled flag should be ignored on Disabled SELinux systems
Victor Vieux 11 年之前
父节点
当前提交
f2bc723bc6
共有 3 个文件被更改,包括 9 次插入1 次删除
  1. 1 1
      daemon/daemon.go
  2. 4 0
      daemon/utils_linux.go
  3. 4 0
      daemon/utils_nolinux.go

+ 1 - 1
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!")
 	}
 

+ 4 - 0
daemon/utils_linux.go

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

+ 4 - 0
daemon/utils_nolinux.go

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