From 344a91a5f11cd904579c0ab5b179d832417ee926 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Tue, 2 Oct 2018 16:43:16 +0200 Subject: [PATCH] Add /apex tmpfs mount and mount it. APEX filesystem images will now be mounted in /apex. Also, make sure /data/apex is created with the right ACL. Bug: 112455435 Test: flash and wipe, /apex is mounted as tmpfs, /data/apex is created Change-Id: Ie27775e9f40a27b510272f212762624a04e94f1d --- rootdir/Android.mk | 2 +- rootdir/init.rc | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index b68dc341a..a4c3955a7 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -77,7 +77,7 @@ endif # # create some directories (some are mount points) and symlinks LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \ - sbin dev proc sys system data odm oem acct config storage mnt $(BOARD_ROOT_EXTRA_FOLDERS)); \ + sbin dev proc sys system data odm oem acct config storage mnt apex $(BOARD_ROOT_EXTRA_FOLDERS)); \ ln -sf /system/bin $(TARGET_ROOT_OUT)/bin; \ ln -sf /system/etc $(TARGET_ROOT_OUT)/etc; \ ln -sf /data/user_de/0/com.android.shell/files/bugreports $(TARGET_ROOT_OUT)/bugreports; \ diff --git a/rootdir/init.rc b/rootdir/init.rc index f39ea7c09..826accd56 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -269,6 +269,12 @@ on init # that they can be chown'd to system:system later on boot write /sys/class/leds/vibrator/trigger "transient" + # Setup APEX mount point and its security context + mount tmpfs tmpfs /apex nodev noexec nosuid + chmod 0755 /apex + chown root root /apex + restorecon /apex + # Healthd can trigger a full boot from charger mode by signaling this # property when the power button is held. on property:sys.boot_from_charger_mode=1 @@ -523,6 +529,8 @@ on post-fs-data mkdir /data/anr 0775 system system + mkdir /data/apex 0770 root root + # NFC: create data/nfc for nv storage mkdir /data/nfc 0770 nfc nfc mkdir /data/nfc/param 0770 nfc nfc