commit 031b385cafc5285bffc1a959e0dc8aa8b9e479e9
author Nick Kralevich <nnk@google.com> Tue Dec 08 04:54:15 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 08 04:54:15 2015 +0000
tree bdb8463be3bb8f89ee8a20ac27abd2268e844473
parent c3d9e739d097c82e14453e8b6902fb8bf4dd1665
parent 2310c332d158cedb15b96e72328fd78a4f7d5a44

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

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

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index b43f8f9..25cb64f 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