commit acd96b11189e0422fa4060bc29139fbfef5b14a8
author Nick Kralevich <nnk@google.com> Tue Jan 28 21:02:57 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 28 21:02:57 2014 +0000
tree 3556c5adc99926dd3cd38df8f158e700123985d6
parent 9aaba5cad1197a16c6af13bca76fbc95eeb25ca7
parent 12db3eb6db3b80011043e404530012612a1d0fbf

am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."

* commit '12db3eb6db3b80011043e404530012612a1d0fbf':
  Move restorecon and restorecon_recursive code to libselinux.

init/init.c

diff --git a/init/init.c b/init/init.c
index 0250e97..00f4558 100644
--- a/init/init.c
+++ b/init/init.c
@@ -842,7 +842,6 @@
 #endif
 
 static const struct selinux_opt seopts_prop[] = {
-        { SELABEL_OPT_PATH, "/data/security/property_contexts" },
         { SELABEL_OPT_PATH, "/property_contexts" },
         { 0, NULL }
 };

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index a32366c..f3f3187 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -142,6 +142,11 @@
 # checker programs.
     mkdir /dev/fscklogs 0770 root system
 
+# pstore/ramoops previous console log
+    mount pstore pstore /sys/fs/pstore
+    chown system log /sys/fs/pstore/console-ramoops
+    chmod 0440 /sys/fs/pstore/console-ramoops
+
 on post-fs
     # once everything is setup, no need to modify /
     mount rootfs rootfs / ro remount