commit c96c29548fa0c933e5aa78116f90ff6be5c4fc39
author Christopher Ferris <cferris@google.com> Wed Jan 29 08:07:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 29 08:07:27 2014 +0000
tree 532998a206ddba9bd4b31b009cb0bb4102311438
parent 5abe06bf8bfed0c15dc56b6d2cd30cc10c898153
parent a152ed734f179ee2748d306f2eb57acbb4df1ace

am a152ed73: Merge "Fix global pointing to local variable."

* commit 'a152ed734f179ee2748d306f2eb57acbb4df1ace':
  Fix global pointing to local variable.

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