Merge pull request moby#8 from crawford/selinux

Revert "selinux/overlay incompatible err"
cherrry · Nov 25, 2015 · 37fb0ab · 37fb0ab
2 parents f4c9adf + 4df5e15
commit 37fb0ab
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
@@ -262,9 +262,9 @@ func checkSystem() error {
 func configureKernelSecuritySupport(config *Config, driverName string) error {
 	if config.EnableSelinuxSupport {
 		if selinuxEnabled() {
-			// 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)
+			// 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")
 			}
 			logrus.Debug("SELinux enabled successfully")
 		} else {