opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3334 from vrothberg/fix-3331

Browse Source 
pkg/apparmor: fix when AA is disabled
This commit is contained in:
OpenShift Merge Robot
2019-06-14 21:24:53 +02:00
committed by GitHub
parent 4c849a79ea e611176760
commit 4a450d55d9
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/apparmor/apparmor_linux.go
View File

@ -225,9 +225,14 @@ func CheckProfileAndLoadDefault(name string) (string, error) {
} }
} }
if name != "" && !runcaa.IsEnabled() { // Check if AppArmor is disabled and error out if a profile is to be set.
if !runcaa.IsEnabled() {
if name == "" {
return "", nil
} else {
return "", fmt.Errorf("profile %q specified but AppArmor is disabled on the host", name) return "", fmt.Errorf("profile %q specified but AppArmor is disabled on the host", name)
} }
}
// If the specified name is not empty or is not a default libpod one, // If the specified name is not empty or is not a default libpod one,
// ignore it and return the name. // ignore it and return the name.