commit b518659848b6f3f939e1b5b150ae8586b9b8d0ce
author Elliott Hughes <enh@google.com> Wed Jul 09 22:31:54 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 09 14:45:53 2014 +0000
tree 2c8111542554e140a6296d2faae2614789e1b467
parent 328c3ef6e0c89686d56b8ce5f926affacd98e815
parent e7f18e14a9e9267150e24f0cb8bd8bd52db7946e

Merge "Integrate vfp-crasher with crasher."

fastboot/fs.h

diff --git a/fastboot/fs.h b/fastboot/fs.h
index 8388629..8444081 100644
--- a/fastboot/fs.h
+++ b/fastboot/fs.h
@@ -1,5 +1,5 @@
 #ifndef _FS_H_
-#define _FH_H_
+#define _FS_H_
 
 #include <stdint.h>
 

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index a983f29..e2bc5b3 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -189,13 +189,11 @@
     chown system cache /cache
     chmod 0770 /cache
     # We restorecon /cache in case the cache partition has been reset.
-    restorecon /cache
+    restorecon_recursive /cache
 
     # This may have been created by the recovery system with odd permissions
     chown system cache /cache/recovery
     chmod 0770 /cache/recovery
-    # This may have been created by the recovery system with the wrong context.
-    restorecon /cache/recovery
 
     #change permissions on vmallocinfo so we can grab it from bugreports
     chown root log /proc/vmallocinfo