summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorTodd Kjos <tkjos@google.com>2016-02-26 17:35:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-02-26 17:35:50 +0000
commitd125f6e8a95a998d74175df49d54251489723933 (patch)
treee888f1046468e5f97892121dcb1eaec81d461a3d /rootdir
parent1e86e1ba1acfec7a16cdad8ab87f262e7bfc3e52 (diff)
parent11cde567a8fd6fd37cd462e24dd97d0f57bb12a4 (diff)
downloadsystem_core-d125f6e8a95a998d74175df49d54251489723933.tar.gz
system_core-d125f6e8a95a998d74175df49d54251489723933.tar.bz2
system_core-d125f6e8a95a998d74175df49d54251489723933.zip
Merge "Mount schedTune cgroup as /dev/stune" into nyc-dev
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/init.rc18
-rw-r--r--rootdir/init.zygote32.rc2
-rw-r--r--rootdir/init.zygote32_64.rc2
-rw-r--r--rootdir/init.zygote64.rc2
-rw-r--r--rootdir/init.zygote64_32.rc2
5 files changed, 13 insertions, 13 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 3c88d31e0..3428417f6 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -44,15 +44,15 @@ on init
mkdir /acct/uid
# Create energy-aware scheduler tuning nodes
- mkdir /sys/fs/cgroup/stune
- mount cgroup none /sys/fs/cgroup/stune schedtune
- mkdir /sys/fs/cgroup/stune/foreground
- chown system system /sys/fs/cgroup/stune
- chown system system /sys/fs/cgroup/stune/foreground
- chown system system /sys/fs/cgroup/stune/tasks
- chown system system /sys/fs/cgroup/stune/foreground/tasks
- chmod 0664 /sys/fs/cgroup/stune/tasks
- chmod 0664 /sys/fs/cgroup/stune/foreground/tasks
+ mkdir /dev/stune
+ mount cgroup none /dev/stune schedtune
+ mkdir /dev/stune/foreground
+ chown system system /dev/stune
+ chown system system /dev/stune/foreground
+ chown system system /dev/stune/tasks
+ chown system system /dev/stune/foreground/tasks
+ chmod 0664 /dev/stune/tasks
+ chmod 0664 /dev/stune/foreground/tasks
# Mount staging areas for devices managed by vold
# See storage config details at http://source.android.com/tech/storage/
diff --git a/rootdir/init.zygote32.rc b/rootdir/init.zygote32.rc
index 1b1d747ef..22b9d6b15 100644
--- a/rootdir/init.zygote32.rc
+++ b/rootdir/init.zygote32.rc
@@ -7,4 +7,4 @@ service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-sys
onrestart restart cameraserver
onrestart restart media
onrestart restart netd
- writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks
+ writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
diff --git a/rootdir/init.zygote32_64.rc b/rootdir/init.zygote32_64.rc
index 04b88549c..555eda4d1 100644
--- a/rootdir/init.zygote32_64.rc
+++ b/rootdir/init.zygote32_64.rc
@@ -13,4 +13,4 @@ service zygote_secondary /system/bin/app_process64 -Xzygote /system/bin --zygote
class main
socket zygote_secondary stream 660 root system
onrestart restart zygote
- writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks
+ writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
diff --git a/rootdir/init.zygote64.rc b/rootdir/init.zygote64.rc
index 21ff647f3..297468cf5 100644
--- a/rootdir/init.zygote64.rc
+++ b/rootdir/init.zygote64.rc
@@ -7,4 +7,4 @@ service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-s
onrestart restart cameraserver
onrestart restart media
onrestart restart netd
- writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks
+ writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc
index 257ae19b6..46f9f02e1 100644
--- a/rootdir/init.zygote64_32.rc
+++ b/rootdir/init.zygote64_32.rc
@@ -13,4 +13,4 @@ service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote
class main
socket zygote_secondary stream 660 root system
onrestart restart zygote
- writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks
+ writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks