diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 16:29:46 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 16:29:46 -0800 |
| commit | b1e86e2d1fc315a3b108c28a5ff6bc649ea584d5 (patch) | |
| tree | f19b4590cd850cba130840fdff8988ed97a40497 /rootdir | |
| parent | 33ecd3756347ef2663e500949ab4b33392086fbc (diff) | |
| parent | a6116961338548409b14076eefbef211afc8c3fe (diff) | |
| download | system_core-b1e86e2d1fc315a3b108c28a5ff6bc649ea584d5.zip system_core-b1e86e2d1fc315a3b108c28a5ff6bc649ea584d5.tar.gz system_core-b1e86e2d1fc315a3b108c28a5ff6bc649ea584d5.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/system/core into HEAD
Android 6.0.1 release 3
Change-Id: I8b65c0223e3444360432abd871a9d8f007831ba0
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 4b644bc..5c6b606 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -144,23 +144,27 @@ on init # sets up initial cpusets for ActivityManager mkdir /dev/cpuset mount cpuset none /dev/cpuset + + # this ensures that the cpusets are present and usable, but the device's + # init.rc must actually set the correct cpus mkdir /dev/cpuset/foreground + write /dev/cpuset/foreground/cpus 0 + write /dev/cpuset/foreground/mems 0 mkdir /dev/cpuset/foreground/boost + write /dev/cpuset/foreground/boost/cpus 0 + write /dev/cpuset/foreground/boost/mems 0 mkdir /dev/cpuset/background + write /dev/cpuset/background/cpus 0 + write /dev/cpuset/background/mems 0 + # system-background is for system tasks that should only run on # little cores, not on bigs - # to be used only by init, so don't change the permissions + # to be used only by init, so don't change system-bg permissions mkdir /dev/cpuset/system-background - # this ensures that the cpusets are present and usable, but the device's - # init.rc must actually set the correct cpus - write /dev/cpuset/foreground/cpus 0 - write /dev/cpuset/foreground/boost/cpus 0 - write /dev/cpuset/background/cpus 0 write /dev/cpuset/system-background/cpus 0 - write /dev/cpuset/foreground/mems 0 - write /dev/cpuset/foreground/boost/mems 0 - write /dev/cpuset/background/mems 0 write /dev/cpuset/system-background/mems 0 + + # change permissions for all cpusets we'll touch at runtime chown system system /dev/cpuset chown system system /dev/cpuset/foreground chown system system /dev/cpuset/foreground/boost @@ -670,7 +674,7 @@ service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted # encryption) or trigger_restart_min_framework (other encryption) # One shot invocation to encrypt unencrypted volumes -service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default +service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default noui disabled oneshot # vold will set vold.decrypt to trigger_restart_framework (default |