opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-30 07:26:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5962 from rhatdan/selinux

Browse Source 
Fix SELinux functions names to not be repetitive
This commit is contained in:
OpenShift Merge Robot
2020-04-24 12:48:39 +02:00
committed by GitHub
parent 81c7a2444c 995cd97c10
commit 2c457a632c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container_internal.go
View File

@ -435,12 +435,12 @@ func (c *Container) setupStorage(ctx context.Context) error {
processLabel := containerInfo.ProcessLabel
switch {
case c.ociRuntime.SupportsKVM():
processLabel, err = selinux.SELinuxKVMLabel(processLabel)
processLabel, err = selinux.KVMLabel(processLabel)
if err != nil {
return err
}
case c.config.Systemd:
processLabel, err = selinux.SELinuxInitLabel(processLabel)
processLabel, err = selinux.InitLabel(processLabel)
if err != nil {
return err
}

8
pkg/selinux/selinux.go
View File

@ -4,8 +4,8 @@ import (
"github.com/opencontainers/selinux/go-selinux"
)
// SELinuxKVMLabel returns labels for running kvm isolated containers
func SELinuxKVMLabel(cLabel string) (string, error) {
// KVMLabel returns labels for running kvm isolated containers
func KVMLabel(cLabel string) (string, error) {
if cLabel == "" {
// selinux is disabled
return "", nil
@ -15,8 +15,8 @@ func SELinuxKVMLabel(cLabel string) (string, error) {
return swapSELinuxLabel(cLabel, processLabel)
}
// SELinuxInitLabel returns labels for running systemd based containers
func SELinuxInitLabel(cLabel string) (string, error) {
// InitLabel returns labels for running systemd based containers
func InitLabel(cLabel string) (string, error) {
if cLabel == "" {
// selinux is disabled
return "", nil