vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge branch 'selinux' of https://github.com/rhatdan/docker into rhatdan-selinux

Browse source 
Conflicts:
	pkg/selinux/selinux.go
	runtime/execdriver/lxc/lxc_template.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-04-02 16:11:35 +00:00
commit bdea26ea08
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
selinux/selinux.go
View file

@ -312,7 +312,7 @@ func GetLxcContexts() (processLabel string, fileLabel string) {
if !SelinuxEnabled() { if !SelinuxEnabled() {
return "", "" return "", ""
} }
lxcPath := fmt.Sprintf("%s/content/lxc_contexts", GetSELinuxPolicyRoot()) lxcPath := fmt.Sprintf("%s/contexts/lxc_contexts", GetSELinuxPolicyRoot())
in, err := os.Open(lxcPath) in, err := os.Open(lxcPath)
if err != nil { if err != nil {
return "", "" return "", ""