commit dbe7f2f66cd1c92ccbd27ad0a61b32e88854ae17
author The Android Automerger <android-build@google.com> Wed Sep 11 06:01:25 2013 -0700
committer The Android Automerger <android-build@google.com> Wed Sep 11 06:01:25 2013 -0700
tree 77c52e893936a2d20533ce4469c64564a7b0c684
parent 67b00d8b2d96e8133c249bcbc0fb63c49e10e022
parent 85a8cfc8a663277a6d2ae72f7ae4739aa4c90205

merge in klp-release history after reset to klp-dev

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 6140ba1..19ab6cc 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -42,13 +42,13 @@
     mkdir /acct/uid
 
 # Create cgroup mount point for memory
-    mount tmpfs none /sys/fs/cgroup
-    mkdir /sys/fs/cgroup/memory
+    mount tmpfs none /sys/fs/cgroup mode=0750,uid=0,gid=1000
+    mkdir /sys/fs/cgroup/memory 0750 root system
     mount cgroup none /sys/fs/cgroup/memory memory
     write /sys/fs/cgroup/memory/memory.move_charge_at_immigrate 1
     chown root system /sys/fs/cgroup/memory/tasks
     chmod 0660 /sys/fs/cgroup/memory/tasks
-    mkdir /sys/fs/cgroup/memory/sw
+    mkdir /sys/fs/cgroup/memory/sw 0750 root system
     write /sys/fs/cgroup/memory/sw/memory.swappiness 100
     write /sys/fs/cgroup/memory/sw/memory.move_charge_at_immigrate 1
     chown root system /sys/fs/cgroup/memory/sw/tasks