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

Fix lxc label handleing

Browse source 
This also improves the logic around formatting the labels for selinux
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:52:49 +00:00
parent bdea26ea08
commit de5d0ed979
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
label/label.go
View file

@ -6,7 +6,7 @@ func GenLabels(options string) (string, string, error) {
return "", "", nil return "", "", nil
} }
func FormatMountLabel(src string, MountLabel string) string { func FormatMountLabel(src string, mountLabel string) string {
return src return src
} }

30
label/label_selinux.go
View file

@ -10,12 +10,15 @@ import (
func GenLabels(options string) (string, string, error) { func GenLabels(options string) (string, string, error) {
processLabel, mountLabel := selinux.GetLxcContexts() processLabel, mountLabel := selinux.GetLxcContexts()
var err error
if processLabel == "" { // SELinux is disabled if processLabel == "" { // SELinux is disabled
return "", "", err return "", "", nil
} }
s := strings.Fields(options)
l := len(s) var (
err error
s = strings.Fields(options)
l = len(s)
)
if l > 0 { if l > 0 {
pcon := selinux.NewContext(processLabel) pcon := selinux.NewContext(processLabel)
for i := 0; i < l; i++ { for i := 0; i < l; i++ {
@ -28,19 +31,16 @@ func GenLabels(options string) (string, string, error) {
return processLabel, mountLabel, err return processLabel, mountLabel, err
} }
func FormatMountLabel(src string, MountLabel string) string { func FormatMountLabel(src string, mountLabel string) string {
var mountLabel string if mountLabel != "" {
if src != "" { switch src {
mountLabel = src case "":
if MountLabel != "" { src = fmt.Sprintf("%s,context=%s", src, mountLabel)
mountLabel = fmt.Sprintf("%s,context=\"%s\"", mountLabel, MountLabel) default:
} src = fmt.Sprintf("context=%s", mountLabel)
} else {
if MountLabel != "" {
mountLabel = fmt.Sprintf("context=\"%s\"", MountLabel)
} }
} }
return mountLabel return src
} }
func SetProcessLabel(processLabel string) error { func SetProcessLabel(processLabel string) error {