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

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

profiles/apparmor.d/abstractions/apparmor_api/is_enabled

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

profiles/apparmor.d/tunables/kernelvars

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

profiles/apparmor.d/tunables/securityfs

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

profiles/apparmor.d/tunables/sys

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