am a42f152b: Merge "rootdir: Fix system emulation startup." into honeycomb (620a5401) · Commits · e / os / android_system_core

rootdir/etc/init.goldfish.rc

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,11 @@ on boot
	stop dund		stop dund
	stop akmd		stop akmd

			# start essential services
			start qemud
			start goldfish-logcat
			start goldfish-setup

	setprop ro.setupwizard.mode EMULATOR		setprop ro.setupwizard.mode EMULATOR

	# enable Google-specific location features,		# enable Google-specific location features,
	@@ -42,6 +47,8 @@ on boot
	# something else.		# something else.

	service goldfish-setup /system/etc/init.goldfish.sh		service goldfish-setup /system/etc/init.goldfish.sh
			user root
			group root
	oneshot		oneshot

	service qemud /system/bin/qemud		service qemud /system/bin/qemud
	@@ -52,7 +59,7 @@ service qemud /system/bin/qemud
	# program to check wether it runs on the emulator		# program to check wether it runs on the emulator
	# if it does, it redirects its output to the device		# if it does, it redirects its output to the device
	# named by the androidboot.console kernel option		# named by the androidboot.console kernel option
	# if not, is simply exit immediately		# if not, is simply exits immediately

	service goldfish-logcat /system/bin/logcat -Q		service goldfish-logcat /system/bin/logcat -Q
	oneshot		oneshot

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@ case "$qemud" in
	;;		;;
	esac		esac

	num_dns=`getprop ro.kernel.android.ndns`		num_dns=`getprop ro.kernel.ndns`
	case "$num_dns" in		case "$num_dns" in
	2) setprop net.eth0.dns2 10.0.2.4		2) setprop net.eth0.dns2 10.0.2.4
	;;		;;
	@@ -44,7 +44,7 @@ esac

	# this line doesn't really do anything useful. however without it the		# this line doesn't really do anything useful. however without it the
	# previous setprop doesn't seem to apply for some really odd reason		# previous setprop doesn't seem to apply for some really odd reason
	setprop ro.qemu.init.completed 1		#setprop ro.qemu.init.completed 1

	# set up the second interface (for inter-emulator connections)		# set up the second interface (for inter-emulator connections)
	# if required		# if required

+4 −0

Original line number	Original line	Diff line number	Diff line
			# These settings are specific to running under the Android emulator
			/dev/qemu_trace 0666 system system
			/dev/ttyS* 0666 system system
			/proc 0666 system system

+0 −1