github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-20 09:05:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6867 from pmorie/libcontainer-bug

Browse Source 
Remove workaround for libcontainer Getfilecon bug
This commit is contained in:
Victor Marmol 2015-04-15 11:02:46 -07:00
commit 902e1196ac
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubelet/root_context_linux.go
View File

@ -31,17 +31,5 @@ func (kl *Kubelet) getRootDirContext() (string, error) {
} }
// Get the SELinux context of the rootDir. // Get the SELinux context of the rootDir.
rootContext, err := selinux.Getfilecon(kl.getRootDir()) return selinux.Getfilecon(kl.getRootDir())
if err != nil {
return "", err
}
// There is a libcontainer bug where the null byte is not stripped from
// the result of reading some selinux xattrs; strip it.
//
// TODO: remove when https://github.com/docker/libcontainer/issues/499
// is fixed
rootContext = rootContext[:len(rootContext)-1]
return rootContext, nil
} }