diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-07 05:22:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 05:22:26 -0400 |
| commit | 663ea964733f5d7ccef9b457b33e97ebdec79e70 (patch) | |
| tree | eeb081a3cb376005fe4691c78acbd43a92dc2692 /libpod | |
| parent | 034470e5be8cfeef8ce0e0d2f47587a660682219 (diff) | |
| parent | f528511bf6c7630408dc630d05197a49d39479c4 (diff) | |
| download | podman-663ea964733f5d7ccef9b457b33e97ebdec79e70.tar.gz podman-663ea964733f5d7ccef9b457b33e97ebdec79e70.tar.bz2 podman-663ea964733f5d7ccef9b457b33e97ebdec79e70.zip | |
Merge pull request #10253 from rhatdan/relabel
Revert Patch to relabel if selinux not enabled
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal_linux.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index f0608e2b2..14816f6aa 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -377,14 +377,8 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { case "z": fallthrough case "Z": - if c.MountLabel() != "" { - if c.ProcessLabel() != "" { - if err := label.Relabel(m.Source, c.MountLabel(), label.IsShared(o)); err != nil { - return nil, err - } - } else { - logrus.Infof("Not relabeling volume %q in container %s as SELinux is disabled", m.Source, c.ID()) - } + if err := label.Relabel(m.Source, c.MountLabel(), label.IsShared(o)); err != nil { + return nil, err } default: |