commit ea24b9731e32e49e0d35ba292c79cf62de834392
author Paul Lawrence <paullawrence@google.com> Mon Nov 07 15:12:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 07 15:12:22 2016 +0000
tree 0f9d273ff7f8e7facb5361319fae1a019c34fc3b
parent 4ad6b19dfb5f847a123b07c213c6a81f59ec4136
parent f39ea2f209ec8448496cf1d9728a6db3737ec90a

Merge "Fix selinux warning on tracefs systems" am: 0ad600bdc6
am: 3915012a46

Change-Id: I07be8c612ab048807fb26cdef455060acb5c911a

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 0eb7f0b..ef3c8f9 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -307,6 +307,10 @@
     # Make sure /sys/kernel/debug (if present) is labeled properly
     restorecon_recursive /sys/kernel/debug
 
+    # On systems with tracefs, tracing is a separate mount, so make sure
+    # it too is correctly labeled
+    restorecon_recursive /sys/kernel/debug/tracing
+
     # We chown/chmod /cache again so because mount is run as root + defaults
     chown system cache /cache
     chmod 0770 /cache