瀏覽代碼

Merge pull request #16025 from sallyom/overlayfsSelinux

selinux/overlay incompatible err
Brian Goff 9 年之前
父節點
當前提交
9d0eef55ea
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      daemon/daemon_unix.go

+ 3 - 3
daemon/daemon_unix.go

@@ -236,9 +236,9 @@ func checkSystem() error {
 func configureKernelSecuritySupport(config *Config, driverName string) error {
 	if config.EnableSelinuxSupport {
 		if selinuxEnabled() {
-			// As Docker on btrfs and SELinux are incompatible at present, error on both being enabled
-			if driverName == "btrfs" {
-				return fmt.Errorf("SELinux is not supported with the BTRFS graph driver")
+			// As Docker on either btrfs or overlayFS and SELinux are incompatible at present, error on both being enabled
+			if driverName == "btrfs" || driverName == "overlay" {
+				return fmt.Errorf("SELinux is not supported with the %s graph driver", driverName)
 			}
 			logrus.Debug("SELinux enabled successfully")
 		} else {