diff options
| author | Naveen <172697+naveensrinivasan@users.noreply.github.com> | 2022-04-02 16:29:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-02 16:29:37 -0500 |
| commit | 6375a85055b4472846445a37464851429edfa447 (patch) | |
| tree | a296f777fa928beaa40c6e9731d4df161d08d91e /pkg/specgen/container_validate.go | |
| parent | 9cacc18c951d4497b5979f96d829c86ca41f777f (diff) | |
| parent | d4394ea3688ad1942b8457f6df869f7c440d49e7 (diff) | |
| download | podman-6375a85055b4472846445a37464851429edfa447.tar.gz podman-6375a85055b4472846445a37464851429edfa447.tar.bz2 podman-6375a85055b4472846445a37464851429edfa447.zip | |
Merge branch 'containers:main' into naveen/feat/set-perms-actions
Diffstat (limited to 'pkg/specgen/container_validate.go')
| -rw-r--r-- | pkg/specgen/container_validate.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go index e71eafb75..42b70e334 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -83,10 +83,6 @@ func (s *SpecGenerator) Validate() error { // // ContainerSecurityConfig // - // capadd and privileged are exclusive - if len(s.CapAdd) > 0 && s.Privileged { - return exclusiveOptions("CapAdd", "privileged") - } // userns and idmappings conflict if s.UserNS.IsPrivate() && s.IDMappings == nil { return errors.Wrap(ErrInvalidSpecConfig, "IDMappings are required when not creating a User namespace") |