diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-24 12:48:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 12:48:39 +0200 |
| commit | 2c457a632c73cad3acfd5946633e67ef26211b34 (patch) | |
| tree | bad4119959e52c27e26b43a186c45c22e08b21db | |
| parent | 81c7a2444cb5cbf8b8911cdb59446a239f89168c (diff) | |
| parent | 995cd97c100f65e477585e705c71eb48a9ab3890 (diff) | |
| download | podman-2c457a632c73cad3acfd5946633e67ef26211b34.tar.gz podman-2c457a632c73cad3acfd5946633e67ef26211b34.tar.bz2 podman-2c457a632c73cad3acfd5946633e67ef26211b34.zip | |
Merge pull request #5962 from rhatdan/selinux
Fix SELinux functions names to not be repetitive
| -rw-r--r-- | libpod/container_internal.go | 4 | ||||
| -rw-r--r-- | pkg/selinux/selinux.go | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 4cb80a98b..3fcf687ec 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -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 } diff --git a/pkg/selinux/selinux.go b/pkg/selinux/selinux.go index 975519cce..6b6d065f7 100644 --- a/pkg/selinux/selinux.go +++ b/pkg/selinux/selinux.go @@ -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 |