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

Merge "resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp" into mnc-dr-dev-plus-aosp

Browse source
This commit is contained in:
Daniel Rosenberg 2015-07-14 20:21:52 +00:00 • committed by Android (Google) Code Review
commit 1c45c0ff5d
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rootdir/init.rc
View file

@ -29,8 +29,7 @@ on init
# Link /vendor to /system/vendor for devices without a vendor partition. # Link /vendor to /system/vendor for devices without a vendor partition.
symlink /system/vendor /vendor symlink /system/vendor /vendor
# Create cgroup mount point for cpu accounting # Mount cgroup mount point for cpu accounting
mkdir /acct
mount cgroup none /acct cpuacct mount cgroup none /acct cpuacct
mkdir /acct/uid mkdir /acct/uid
@ -47,14 +46,8 @@ on init
chown root system /sys/fs/cgroup/memory/sw/tasks chown root system /sys/fs/cgroup/memory/sw/tasks
chmod 0660 /sys/fs/cgroup/memory/sw/tasks chmod 0660 /sys/fs/cgroup/memory/sw/tasks
mkdir /system
mkdir /data 0771 system system
mkdir /cache 0770 system cache
mkdir /config 0500 root root
# Mount staging areas for devices managed by vold # Mount staging areas for devices managed by vold
# See storage config details at http://source.android.com/tech/storage/ # See storage config details at http://source.android.com/tech/storage/
mkdir /mnt 0755 root system
mount tmpfs tmpfs /mnt mode=0755,uid=0,gid=1000 mount tmpfs tmpfs /mnt mode=0755,uid=0,gid=1000
restorecon_recursive /mnt restorecon_recursive /mnt
@ -68,7 +61,6 @@ on init
mkdir /mnt/expand 0771 system system mkdir /mnt/expand 0771 system system
# Storage views to support runtime permissions # Storage views to support runtime permissions
mkdir /storage 0755 root root
mkdir /mnt/runtime_default 0755 root root mkdir /mnt/runtime_default 0755 root root
mkdir /mnt/runtime_default/self 0755 root root mkdir /mnt/runtime_default/self 0755 root root
mkdir /mnt/runtime_read 0755 root root mkdir /mnt/runtime_read 0755 root root