Merge "rootfs: init.rc start logd parse error" (76520752) · Commits · e / os / android_system_core

rootdir/init.rc

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -162,6 +162,7 @@ on property:sys.boot_from_charger_mode=1
	# Load properties from /system/ + /factory after fs mount.		# Load properties from /system/ + /factory after fs mount.
	on load_all_props_action		on load_all_props_action
	load_all_props		load_all_props
			start logd
	start logd-reinit		start logd-reinit

	# Indicate to fw loaders that the relevant mounts are up.		# Indicate to fw loaders that the relevant mounts are up.
	@@ -445,6 +446,7 @@ on property:vold.decrypt=trigger_reset_main

	on property:vold.decrypt=trigger_load_persist_props		on property:vold.decrypt=trigger_load_persist_props
	load_persist_props		load_persist_props
			start logd
	start logd-reinit		start logd-reinit

	on property:vold.decrypt=trigger_post_fs_data		on property:vold.decrypt=trigger_post_fs_data
	@@ -490,7 +492,6 @@ service logd /system/bin/logd
	socket logdw dgram 0222 logd logd		socket logdw dgram 0222 logd logd

	service logd-reinit /system/bin/logd --reinit		service logd-reinit /system/bin/logd --reinit
	start logd
	oneshot		oneshot
	disabled		disabled