commit 9aaba5cad1197a16c6af13bca76fbc95eeb25ca7
author Kristian Monsen <kristianm@google.com> Tue Jan 28 19:57:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 28 19:57:33 2014 +0000
tree 2b611dd169e46f94bfe41d4937956d18ac5a88df
parent 68a74ec483db4317de0e309eb63d846009b018e9
parent 8c6b9b0d95974be3ba21c133661772206bc15e39

am 8c6b9b0d: Merge "Fixes some warnings"

* commit '8c6b9b0d95974be3ba21c133661772206bc15e39':
  Fixes some warnings

init/init.c

diff --git a/init/init.c b/init/init.c
index 4266a73..08fd5fb 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