Skip to content

Commit f9ba86c

Browse files
committed
Revert "Change default profile to unconfined; remove CheckProfileAndLoadDefault"
This reverts commit 5c25c1c because it was merged prematurely. Signed-off-by: Valentin Rothberg <[email protected]>
1 parent 06e6651 commit f9ba86c

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

pkg/apparmor/apparmor.go

+4-7
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@ package apparmor
22

33
import (
44
"errors"
5+
6+
"github.com/containers/common/version"
57
)
68

79
const (
810
// ProfilePrefix is used for version-independent presence checks.
911
ProfilePrefix = "containers-default-"
1012

11-
// Default AppArmor profile used by containers; by default this is set to unconfined.
12-
// To override this, distros should supply their own profile and specify it in a default
13-
// containers.conf.
14-
// See the following issues for more information:
15-
// - https://github.com/containers/common/issues/958
16-
// - https://github.com/containers/podman/issues/15874
17-
Profile = "unconfined"
13+
// Profile default name
14+
Profile = ProfilePrefix + version.Version
1815
)
1916

2017
var (

0 commit comments

Comments
 (0)