jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #619 from rhatdan/relabel 

Fix relabel to allow volume mounting of /
This commit is contained in:
Mrunal Patel 2015-06-09 13:46:39 -07:00
parent 688ec20a4a 827ae1f0a2
commit 4369703200
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
label/label_selinux.go
View File

@ -105,14 +105,14 @@ func Relabel(path string, fileLabel string, relabel string) error {
if fileLabel == "" { if fileLabel == "" {
return nil return nil
} }
if !strings.ContainsAny(relabel, "zZ") {
return nil
}
for _, p := range exclude_path { for _, p := range exclude_path {
if path == p { if path == p {
return fmt.Errorf("Relabeling of %s is not allowed", path) 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") { if strings.Contains(relabel, "z") && strings.Contains(relabel, "Z") {
return fmt.Errorf("Bad SELinux option z and Z can not be used together") return fmt.Errorf("Bad SELinux option z and Z can not be used together")
} }