commit 2310c332d158cedb15b96e72328fd78a4f7d5a44
author Nick Kralevich <nnk@google.com> Tue Dec 08 04:50:55 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 08 04:50:55 2015 +0000
tree 2dbd066a070c29a342d41f6d3263affc89c719ed
parent 1e20ade715dadca24d4ef1acd2582eacd14fe735
parent e33ad516e5cebba37ec6316092b1fc95beb70133

Merge "init.rc: restorecon_recursive /sys/kernel/debug" am: 6d85c06aa1
am: 070288241d

* commit '070288241d5c3d1a169e21ba4439a5943ce476d8':
  init.rc: restorecon_recursive /sys/kernel/debug

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index ee04ec9..b0dab97 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -261,6 +261,9 @@
     # Mount default storage into root namespace
     mount none /mnt/runtime/default /storage slave bind rec
 
+    # Make sure /sys/kernel/debug (if present) is labeled properly
+    restorecon_recursive /sys/kernel/debug
+
     # We chown/chmod /cache again so because mount is run as root + defaults
     chown system cache /cache
     chmod 0770 /cache