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

Merge "Add /mnt/vendor rw mount point for vendor partitions." into pi-dev

Browse source
This commit is contained in:
TreeHugger Robot 2018-04-17 19:16:55 +00:00 • committed by Android (Google) Code Review
commit b35c019d5c
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init/init.cpp
View file

@ -595,6 +595,14 @@ int main(int argc, char** argv) {
mknod("/dev/random", S_IFCHR | 0666, makedev(1, 8)); mknod("/dev/random", S_IFCHR | 0666, makedev(1, 8));
mknod("/dev/urandom", S_IFCHR | 0666, makedev(1, 9)); mknod("/dev/urandom", S_IFCHR | 0666, makedev(1, 9));
// Mount staging areas for devices managed by vold
// See storage config details at http://source.android.com/devices/storage/
mount("tmpfs", "/mnt", "tmpfs", MS_NOEXEC | MS_NOSUID | MS_NODEV,
"mode=0755,uid=0,gid=1000");
// /mnt/vendor is used to mount vendor-specific partitions that can not be
// part of the vendor partition, e.g. because they are mounted read-write.
mkdir("/mnt/vendor", 0755);
// 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
// talk to the outside world... // talk to the outside world...
InitKernelLogging(argv); InitKernelLogging(argv);

6
rootdir/init.rc
View file

@ -21,9 +21,6 @@ on early-init
# Set the security context of /adb_keys if present. # Set the security context of /adb_keys if present.
restorecon /adb_keys restorecon /adb_keys
# Shouldn't be necessary, but sdcard won't start without it. http://b/22568628.
mkdir /mnt 0775 root system
# Set the security context of /postinstall if present. # Set the security context of /postinstall if present.
restorecon /postinstall restorecon /postinstall
@ -80,9 +77,6 @@ on init
chmod 0664 /dev/stune/top-app/tasks chmod 0664 /dev/stune/top-app/tasks
chmod 0664 /dev/stune/rt/tasks chmod 0664 /dev/stune/rt/tasks
# Mount staging areas for devices managed by vold
# See storage config details at http://source.android.com/tech/storage/
mount tmpfs tmpfs /mnt nodev noexec nosuid mode=0755,uid=0,gid=1000
restorecon_recursive /mnt restorecon_recursive /mnt
mount configfs none /config nodev noexec nosuid mount configfs none /config nodev noexec nosuid