Merge "cgroups used by init must be mounted before any services start" am: 63c15c1b11 (b30ad069) · Commits · e / os / android_system_core

rootdir/init.rc

+10 −10

Original line number	Diff line number	Diff line
		@@ -27,6 +27,16 @@ on early-init
		# Set the security context of /postinstall if present.
		restorecon /postinstall

		# Mount cgroup mount point for cpu accounting
		mount cgroup none /acct cpuacct
		mkdir /acct/uid

		# root memory control cgroup, used by lmkd
		mkdir /dev/memcg 0700 root system
		mount cgroup none /dev/memcg memory
		# app mem cgroups, used by activity manager, lmkd and zygote
		mkdir /dev/memcg/apps/ 0755 system system

		start ueventd

		on init
		@@ -43,10 +53,6 @@ on init
		# Link /vendor to /system/vendor for devices without a vendor partition.
		symlink /system/vendor /vendor

		# Mount cgroup mount point for cpu accounting
		mount cgroup none /acct cpuacct
		mkdir /acct/uid

		# Create energy-aware scheduler tuning nodes
		mkdir /dev/stune
		mount cgroup none /dev/stune schedtune
		@@ -99,12 +105,6 @@ on init
		symlink /storage/self/primary /mnt/sdcard
		symlink /mnt/user/0/primary /mnt/runtime/default/self/primary

		# root memory control cgroup, used by lmkd
		mkdir /dev/memcg 0700 root system
		mount cgroup none /dev/memcg memory
		# app mem cgroups, used by activity manager, lmkd and zygote
		mkdir /dev/memcg/apps/ 0755 system system

		write /proc/sys/kernel/panic_on_oops 1
		write /proc/sys/kernel/hung_task_timeout_secs 0
		write /proc/cpu/alignment 4