mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 22:35:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'sys-by-default' into 'master'

Browse Source 
Make @{sys} available by default

See merge request apparmor/apparmor!228

Acked-by: Christian Boltz <apparmor@cboltz.de> for 2.10..master

(cherry picked from commit 772a8702e0)

aa065287 Make @{sys} available by default
This commit is contained in:
Christian Boltz
2018-10-09 22:30:10 +00:00
parent 1bb6223de4
commit 108e8afe6b
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
profiles/apparmor.d/abstractions/apparmor_api/is_enabled
View File

@@ -8,8 +8,8 @@
# permissions needed for aa_is_enabled # permissions needed for aa_is_enabled
# Make sure to include at least tunables/sys and tunables/apparmorfs # Make sure to include tunables/apparmorfs and tunables/global
# when using this abstraction, if not tunables/global. # when using this abstraction
#include <abstractions/apparmor_api/find_mountpoint> #include <abstractions/apparmor_api/find_mountpoint>
@{sys}/module/apparmor/parameters/enabled r, @{sys}/module/apparmor/parameters/enabled r,

3
profiles/apparmor.d/tunables/kernelvars
View File

@@ -28,3 +28,6 @@
#same pattern as @{uid} for now #same pattern as @{uid} for now
@{uids}=@{uid} @{uids}=@{uid}
# until kernel var is implemented
@{sys}=/sys/

2
profiles/apparmor.d/tunables/securityfs
View File

@@ -6,7 +6,5 @@
# #
# ------------------------------------------------------------------ # ------------------------------------------------------------------
#include <tunables/sys>
# @{securityfs} is the location where securityfs is mounted. # @{securityfs} is the location where securityfs is mounted.
@{securityfs}=@{sys}/kernel/security/ @{securityfs}=@{sys}/kernel/security/

3
profiles/apparmor.d/tunables/sys
View File

@@ -6,5 +6,4 @@
# #
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# @{sys} is the location where sysfs is mounted. #This file is DEPRECATED! @{sys} is defined in tunables/kernelvars now.
@{sys}=/sys/