commit 68a74ec483db4317de0e309eb63d846009b018e9
author Benoit Goby <benoitgoby@google.com> Tue Jan 28 00:43:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 28 00:43:37 2014 +0000
tree 370f078cf1c87f214743fa6d043bc1404f2cdc95
parent 9b16f7db5c1bd9ed515b018072f67173e1d2072d
parent 6ddabb7a1cc3080ae773acb045f69b5e6afee87a

am 6ddabb7a: Merge "adbd: Don\'t close/reopen FFS ep0 on disconnect"

* commit '6ddabb7a1cc3080ae773acb045f69b5e6afee87a':
  adbd: Don't close/reopen FFS ep0 on disconnect

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