We should always return the MountLabel

We need to have labels applied even if a container is running in privileged
mode.  On an tightly locked down SELinux system, this will cause running
without labels will cause SELinux to block privileged mode containers.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 3894773d6edf8127ddf5f811492a9b49673196e7
Component: engine
This commit is contained in:
Dan Walsh
2016-04-30 05:46:56 -04:00
parent d380357613
commit e351be03d1
-3
View File
@@ -340,9 +340,6 @@ func (container *Container) GetProcessLabel() string {
// GetMountLabel returns the mounting label for the container.
// This label is empty if the container is privileged.
func (container *Container) GetMountLabel() string {
if container.HostConfig.Privileged {
return ""
}
return container.MountLabel
}