summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Crowley <paulcrowley@google.com>2018-05-17 10:12:34 -0700
committerPaul Crowley <paulcrowley@google.com>2018-05-18 14:10:56 -0700
commitfe305ab286cadea129f2b8af01c0132631efc109 (patch)
tree0c12dd62503f443f07259603ccf856641c90b7dc
parent7905b1e16286653679b7ff9b595f3ed7de5e182f (diff)
downloadcore-fe305ab286cadea129f2b8af01c0132631efc109.tar.gz
Add option to create metadata mount point
Test: booted metadata-encrypted device Bug: 79781913 Change-Id: Ie922db20314c04409c98700bfb1aff3d111275f0
-rw-r--r--rootdir/Android.mk3
-rw-r--r--rootdir/init.rc4
2 files changed, 7 insertions, 0 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 3c9e5f3c5..80e068af7 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -93,6 +93,9 @@ ifdef BOARD_USES_PRODUCTIMAGE
else
LOCAL_POST_INSTALL_CMD += ; ln -sf /system/product $(TARGET_ROOT_OUT)/product
endif
+ifdef BOARD_USES_METADATA_PARTITION
+ LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/metadata
+endif
# For /odm partition.
LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/odm
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 5b06fdb19..4cc66933f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -369,6 +369,10 @@ on post-fs
# create the lost+found directories, so as to enforce our permissions
mkdir /cache/lost+found 0770 root root
+ restorecon_recursive /metadata
+ mkdir /metadata/vold
+ chmod 0700 /metadata/vold
+
on late-fs
# Ensure that tracefs has the correct permissions.
# This does not work correctly if it is called in post-fs.