diff options
| author | Sascha Grunert <sgrunert@suse.com> | 2020-09-07 10:20:32 +0200 |
|---|---|---|
| committer | Sascha Grunert <sgrunert@suse.com> | 2020-09-07 10:47:32 +0200 |
| commit | 1509adc0a7610f368cd9220352d4895da865bffb (patch) | |
| tree | a85659e1606a60aa7dc4314bb1d62447f6c53c9e /pkg | |
| parent | ba8d0bb5e336e84aaf68148563e61558b5dc94f5 (diff) | |
| download | podman-1509adc0a7610f368cd9220352d4895da865bffb.tar.gz podman-1509adc0a7610f368cd9220352d4895da865bffb.tar.bz2 podman-1509adc0a7610f368cd9220352d4895da865bffb.zip | |
Fix unconfined AppArmor profile usage for unsupported systems
If we select "unconfined" as AppArmor profile, then we should not error
even if the host does not support it at all. This behavior has been
fixed and a corresponding e2e test has been added as well.
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgen/generate/security.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/security.go b/pkg/specgen/generate/security.go index d3e3d9278..87e8029a7 100644 --- a/pkg/specgen/generate/security.go +++ b/pkg/specgen/generate/security.go @@ -60,7 +60,7 @@ func setLabelOpts(s *specgen.SpecGenerator, runtime *libpod.Runtime, pidConfig s func setupApparmor(s *specgen.SpecGenerator, rtc *config.Config, g *generate.Generator) error { hasProfile := len(s.ApparmorProfile) > 0 if !apparmor.IsEnabled() { - if hasProfile { + if hasProfile && s.ApparmorProfile != "unconfined" { return errors.Errorf("Apparmor profile %q specified, but Apparmor is not enabled on this system", s.ApparmorProfile) } return nil |