Merge "Mount /mnt/vm earlier" into main am: 65daca3b88

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3261786

Change-Id: I98e3415b855b8f34e193c7f4004fdd4b208f3e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Inseob Kim 2024-09-20 08:35:41 +00:00 committed by Automerger Merge Worker
commit 51d5a7f546

View file

@ -495,6 +495,14 @@ on init
start hwservicemanager
start vndservicemanager
# Mount /mnt/vm ASAP to allow early VMs to run.
mkdir /mnt/vm 0755 root root
mount tmpfs tmpfs /mnt/vm nosuid nodev noexec rw
restorecon /mnt/vm
chown system system /mnt/vm
chmod 0770 /mnt/vm
mkdir /mnt/vm/early 0770 system system
# Run boringssl self test for each ABI. Any failures trigger reboot to firmware.
import /system/etc/init/hw/init.boringssl.${ro.zygote}.rc
@ -661,14 +669,6 @@ on late-fs
chmod 0755 /sys/kernel/tracing
chmod 0755 /sys/kernel/debug/tracing
# Early HALs may use early VM. Mount /mnt/vm before starting such HALs.
mkdir /mnt/vm 0755 root root
mount tmpfs tmpfs /mnt/vm nosuid nodev noexec rw
restorecon /mnt/vm
chown system system /mnt/vm
chmod 0770 /mnt/vm
mkdir /mnt/vm/early 0770 system system
# HALs required before storage encryption can get unlocked (FBE)
class_start early_hal