mirror of
https://github.com/moby/moby.git
synced 2026-08-03 22:51:03 +00:00
Merge pull request #8181 from rhatdan/selinux_btrfs
--selinux-enabled flag should be ignored on Disabled SELinux systems
This commit is contained in:
@@ -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!")
|
||||
}
|
||||
|
||||
|
||||
@@ -11,3 +11,7 @@ func selinuxSetDisabled() {
|
||||
func selinuxFreeLxcContexts(label string) {
|
||||
selinux.FreeLxcContexts(label)
|
||||
}
|
||||
|
||||
func selinuxEnabled() bool {
|
||||
return selinux.SelinuxEnabled()
|
||||
}
|
||||
|
||||
@@ -7,3 +7,7 @@ func selinuxSetDisabled() {
|
||||
|
||||
func selinuxFreeLxcContexts(label string) {
|
||||
}
|
||||
|
||||
func selinuxEnabled() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user