From 4df5e15ff96fbeae45ec36817acef67b32d3bddd Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 24 Nov 2015 16:29:27 -0800 Subject: [PATCH] Revert "selinux/overlay incompatible err" This reverts commit 04329e0b3e47e411ebf0a4ba8947be6e87014737. --- daemon/daemon_unix.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index d31b83366c213..2313ac90896b0 100644 --- 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 {