ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mount /apex during first_stage init

Browse source 
am: 4ba548d845

Change-Id: I2f86489449b0a81c4173981a8ffe1bcb945df129
This commit is contained in:
Jiyong Park 2019-03-04 23:02:24 -08:00 • committed by android-build-merger
commit 854c5bc218
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/first_stage_init.cpp
View file

@ -155,6 +155,10 @@ int FirstStageMain(int argc, char** argv) {
// part of the product partition, e.g. because they are mounted read-write. // part of the product partition, e.g. because they are mounted read-write.
CHECKCALL(mkdir("/mnt/product", 0755)); CHECKCALL(mkdir("/mnt/product", 0755));
// /apex is used to mount APEXes
CHECKCALL(mount("tmpfs", "/apex", "tmpfs", MS_NOEXEC | MS_NOSUID | MS_NODEV,
"mode=0755,uid=0,gid=0"));
#undef CHECKCALL #undef CHECKCALL
// Now that tmpfs is mounted on /dev and we have /dev/kmsg, we can actually // Now that tmpfs is mounted on /dev and we have /dev/kmsg, we can actually

2
init/selinux.cpp
View file

@ -459,6 +459,8 @@ void SelinuxRestoreContext() {
selinux_android_restorecon("/dev/block", SELINUX_ANDROID_RESTORECON_RECURSE); selinux_android_restorecon("/dev/block", SELINUX_ANDROID_RESTORECON_RECURSE);
selinux_android_restorecon("/dev/device-mapper", 0); selinux_android_restorecon("/dev/device-mapper", 0);
selinux_android_restorecon("/apex", 0);
} }
int SelinuxKlogCallback(int type, const char* fmt, ...) { int SelinuxKlogCallback(int type, const char* fmt, ...) {

6
rootdir/init.rc
View file

@ -278,12 +278,6 @@ on init
write /dev/cpu_variant:${ro.bionic.2nd_arch} ${ro.bionic.2nd_cpu_variant} write /dev/cpu_variant:${ro.bionic.2nd_arch} ${ro.bionic.2nd_cpu_variant}
chmod 0444 /dev/cpu_variant:${ro.bionic.2nd_arch} chmod 0444 /dev/cpu_variant:${ro.bionic.2nd_arch}
# Setup APEX mount point and its security context
mount tmpfs tmpfs /apex nodev noexec nosuid
chmod 0755 /apex
chown root root /apex
restorecon /apex
# Start logd before any other services run to ensure we capture all of their logs. # Start logd before any other services run to ensure we capture all of their logs.
start logd start logd