Skip to content
Snippets Groups Projects
Commit a9e453f1 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-dev

parents 169c12b5 00c8e1a2
No related branches found
No related tags found
No related merge requests found
...@@ -66,8 +66,6 @@ loglevel 3 ...@@ -66,8 +66,6 @@ loglevel 3
# Directory for putting things only root should see. # Directory for putting things only root should see.
mkdir /mnt/secure 0700 root root mkdir /mnt/secure 0700 root root
# Create private mountpoint so we can MS_MOVE from staging
mount tmpfs tmpfs /mnt/secure mode=0700,uid=0,gid=0
# Directory for staging bindmounts # Directory for staging bindmounts
mkdir /mnt/secure/staging 0700 root root mkdir /mnt/secure/staging 0700 root root
...@@ -143,7 +141,6 @@ on post-fs ...@@ -143,7 +141,6 @@ on post-fs
mount rootfs rootfs / ro remount mount rootfs rootfs / ro remount
# mount shared so changes propagate into child namespaces # mount shared so changes propagate into child namespaces
mount rootfs rootfs / shared rec mount rootfs rootfs / shared rec
mount tmpfs tmpfs /mnt/secure private rec
# We chown/chmod /cache again so because mount is run as root + defaults # We chown/chmod /cache again so because mount is run as root + defaults
chown system cache /cache chown system cache /cache
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment