commit a8d8434c42b27f0186be7ecd78c2acc9d459b068
author Paul Lawrence <paullawrence@google.com> Mon Nov 14 15:40:18 2016 -0800
committer Paul Lawrence <paullawrence@google.com> Wed Nov 16 22:27:45 2016 +0000
tree 897dbc3e29e705d582a9d1fbf89eece5fc4b4da3
parent e631e470e059d84388f3aacfe11a3fa60a584ba7

Add flags to restorecon_recursive to traverse filesystems

Use to solve the problem of tracefs conditionally being mounted
under debugfs and needing restorecon'd without boot performance
penalty.

Also move skip-ce to a flag for consistency.

Test: Check that trace_mount has correct attributes after boot
Bug: 32849675
Change-Id: Ib6731f502b6afc393ea5ada96fa95b339f14da49

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index cbd46bf..4efcc34 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -657,8 +657,8 @@
     restorecon("/dev/socket");
     restorecon("/dev/__properties__");
     restorecon("/property_contexts");
-    restorecon_recursive("/sys");
-    restorecon_recursive("/dev/block");
+    restorecon("/sys", SELINUX_ANDROID_RESTORECON_RECURSE);
+    restorecon("/dev/block", SELINUX_ANDROID_RESTORECON_RECURSE);
     restorecon("/dev/device-mapper");
 
     epoll_fd = epoll_create1(EPOLL_CLOEXEC);