Merge "init: call restorecon on /sys"
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 0a21f38..af164f7 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -52,6 +52,19 @@
mount cgroup none /acct cpuacct
mkdir /acct/uid
+# Create cgroup mount point for memory
+ mount tmpfs none /sys/fs/cgroup
+ mkdir /sys/fs/cgroup/memory
+ 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
+ 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
+ chmod 0660 /sys/fs/cgroup/memory/sw/tasks
+
mkdir /system
mkdir /data 0771 system system
mkdir /cache 0770 system cache
@@ -131,14 +144,6 @@
# This is needed by any process that uses socket tagging.
chmod 0644 /dev/xt_qtaguid
-on fs
-# mount mtd partitions
- # Mount /system rw first to give the filesystem a chance to save a checkpoint
- mount ext4 mtd@system /system
- mount ext4 mtd@system /system ro remount
- mount ext4 mtd@userdata /data nosuid nodev
- mount ext4 mtd@cache /cache nosuid nodev
-
on post-fs
# once everything is setup, no need to modify /
mount rootfs rootfs / ro remount