summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey2013-10-17 20:45:05 -0500
committerAndroid (Google) Code Review2013-10-17 20:45:05 -0500
commita9e453f1b552699f69dca19599c7624a581089bd (patch)
treed100ff4c67ff6bd93f66eda7633b89eab53c3780
parent169c12b5cf55d9574f98935d5517d20f55f62be8 (diff)
parent00c8e1a2199b2f9c50935bb4ea8bb3b86ba1bbef (diff)
downloadplatform-system-core-a9e453f1b552699f69dca19599c7624a581089bd.tar.gz
platform-system-core-a9e453f1b552699f69dca19599c7624a581089bd.tar.xz
platform-system-core-a9e453f1b552699f69dca19599c7624a581089bd.zip
Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-dev
-rw-r--r--rootdir/init.rc3
1 files changed, 0 insertions, 3 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 86e124f15..a0a98134b 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -66,8 +66,6 @@ loglevel 3
66 66
67 # Directory for putting things only root should see. 67 # Directory for putting things only root should see.
68 mkdir /mnt/secure 0700 root root 68 mkdir /mnt/secure 0700 root root
69 # Create private mountpoint so we can MS_MOVE from staging
70 mount tmpfs tmpfs /mnt/secure mode=0700,uid=0,gid=0
71 69
72 # Directory for staging bindmounts 70 # Directory for staging bindmounts
73 mkdir /mnt/secure/staging 0700 root root 71 mkdir /mnt/secure/staging 0700 root root
@@ -143,7 +141,6 @@ on post-fs
143 mount rootfs rootfs / ro remount 141 mount rootfs rootfs / ro remount
144 # mount shared so changes propagate into child namespaces 142 # mount shared so changes propagate into child namespaces
145 mount rootfs rootfs / shared rec 143 mount rootfs rootfs / shared rec
146 mount tmpfs tmpfs /mnt/secure private rec
147 144
148 # We chown/chmod /cache again so because mount is run as root + defaults 145 # We chown/chmod /cache again so because mount is run as root + defaults
149 chown system cache /cache 146 chown system cache /cache