diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-15 14:28:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 14:28:53 -0700 |
| commit | 0f7162d791076e736a7cee3a45051925fa4d0589 (patch) | |
| tree | 10751bb96b17a98842fac1cfb4ee5c492064b161 /pkg/specgen/container_validate.go | |
| parent | 3500a8bc39bfc625444fb343a239d607604f06d6 (diff) | |
| parent | ac94a96a74e63854ab492e35c6c5c26145a6674a (diff) | |
| download | podman-0f7162d791076e736a7cee3a45051925fa4d0589.tar.gz podman-0f7162d791076e736a7cee3a45051925fa4d0589.tar.bz2 podman-0f7162d791076e736a7cee3a45051925fa4d0589.zip | |
Merge pull request #5817 from rhatdan/selinux1
Fix up SELinux labeling
Diffstat (limited to 'pkg/specgen/container_validate.go')
| -rw-r--r-- | pkg/specgen/container_validate.go | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go index aad14ddcb..9152e7ee7 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -68,18 +68,6 @@ func (s *SpecGenerator) Validate() error { if len(s.CapAdd) > 0 && s.Privileged { return exclusiveOptions("CapAdd", "privileged") } - // selinuxprocesslabel and privileged are exclusive - if len(s.SelinuxProcessLabel) > 0 && s.Privileged { - return exclusiveOptions("SelinuxProcessLabel", "privileged") - } - // selinuxmounmtlabel and privileged are exclusive - if len(s.SelinuxMountLabel) > 0 && s.Privileged { - return exclusiveOptions("SelinuxMountLabel", "privileged") - } - // selinuxopts and privileged are exclusive - if len(s.SelinuxOpts) > 0 && s.Privileged { - return exclusiveOptions("SelinuxOpts", "privileged") - } // apparmor and privileged are exclusive if len(s.ApparmorProfile) > 0 && s.Privileged { return exclusiveOptions("AppArmorProfile", "privileged") |