diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-22 22:30:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 22:30:59 +0200 |
| commit | 2584d6bd58976de936ba5325d77068d7fb7935a7 (patch) | |
| tree | 6f0c1cc3a0fe189378371a102a20938b7f430cb6 /libpod | |
| parent | 576fe98bbcee7361251b437835125f93b4c10b15 (diff) | |
| parent | ede8380d37359d6ecf878c6e41db5c0f09bbadad (diff) | |
| download | podman-2584d6bd58976de936ba5325d77068d7fb7935a7.tar.gz podman-2584d6bd58976de936ba5325d77068d7fb7935a7.tar.bz2 podman-2584d6bd58976de936ba5325d77068d7fb7935a7.zip | |
Merge pull request #5936 from rhatdan/selinux1
Move selinux labeling support from pkg/util to pkg/selinux
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 50bd9bc25..4cb80a98b 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -19,7 +19,7 @@ import ( "github.com/containers/libpod/pkg/hooks" "github.com/containers/libpod/pkg/hooks/exec" "github.com/containers/libpod/pkg/rootless" - "github.com/containers/libpod/pkg/util" + "github.com/containers/libpod/pkg/selinux" "github.com/containers/storage" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/mount" @@ -435,12 +435,12 @@ func (c *Container) setupStorage(ctx context.Context) error { processLabel := containerInfo.ProcessLabel switch { case c.ociRuntime.SupportsKVM(): - processLabel, err = util.SELinuxKVMLabel(processLabel) + processLabel, err = selinux.SELinuxKVMLabel(processLabel) if err != nil { return err } case c.config.Systemd: - processLabel, err = util.SELinuxInitLabel(processLabel) + processLabel, err = selinux.SELinuxInitLabel(processLabel) if err != nil { return err } |