From 827ae1f0a29a56e0f573f88432b2a71713358d97 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Tue, 9 Jun 2015 16:35:16 -0400 Subject: [PATCH] Fix relabel to allow volume mounting of / Docker-DCO-1.1-Signed-off-by: Dan Walsh (github: rhatdan) --- label/label_selinux.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/label/label_selinux.go b/label/label_selinux.go index 7bc40ddd..c8fba845 100644 --- a/label/label_selinux.go +++ b/label/label_selinux.go @@ -105,14 +105,14 @@ func Relabel(path string, fileLabel string, relabel string) error { if fileLabel == "" { return nil } + if !strings.ContainsAny(relabel, "zZ") { + return nil + } for _, p := range exclude_path { if path == p { return fmt.Errorf("Relabeling of %s is not allowed", path) } } - if !strings.ContainsAny(relabel, "zZ") { - return nil - } if strings.Contains(relabel, "z") && strings.Contains(relabel, "Z") { return fmt.Errorf("Bad SELinux option z and Z can not be used together") }