opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 16:33:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix SELinux functions names to not be repetitive

Browse Source 
Since functions are now in an selinux subpackage, they should not start with
SELinux

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-04-23 15:55:35 -04:00
parent 802763c604
commit 995cd97c10
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 processLabel := containerInfo.ProcessLabel
switch { switch {
case c.ociRuntime.SupportsKVM(): case c.ociRuntime.SupportsKVM():
processLabel, err = selinux.SELinuxKVMLabel(processLabel) processLabel, err = selinux.KVMLabel(processLabel)
if err != nil { if err != nil {
return err return err
} }
case c.config.Systemd: case c.config.Systemd:
processLabel, err = selinux.SELinuxInitLabel(processLabel) processLabel, err = selinux.InitLabel(processLabel)
if err != nil { if err != nil {
return err return err
} }

8
pkg/selinux/selinux.go
View File

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