resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp (60c8f863) · Commits · e / os / android_system_core

rootdir/etc/init.goldfish.sh

+10 −0

Original line number	Diff line number	Diff line
		@@ -45,3 +45,13 @@ esac
		# this line doesn't really do anything useful. however without it the
		# previous setprop doesn't seem to apply for some really odd reason
		setprop ro.qemu.init.completed 1

		# set up the second interface (for inter-emulator connections)
		# if required
		my_ip=`getprop net.shared_net_ip`
		case "$my_ip" in
		"")
		;;
		*) ifconfig eth1 "$my_ip" netmask 255.255.255.0 up
		;;
		esac

+17 −7

Original line number	Diff line number	Diff line
		@@ -80,7 +80,8 @@ int route_main(int argc, char *argv[])

		/* route add -net 192.168.1.2 netmask 255.255.255.0 gw 192.168.1.1 */
		if (argc > 7 && !strcmp(argv[2], "-net") &&
		!strcmp(argv[4], "netmask") && !strcmp(argv[6], "gw")) {
		!strcmp(argv[4], "netmask")) {
		if (!strcmp(argv[6], "gw")) {
		rt.rt_flags = RTF_UP \| RTF_GATEWAY;
		if (set_address(argv[3], &rt.rt_dst) &&
		set_address(argv[5], &rt.rt_genmask) &&
		@@ -88,6 +89,15 @@ int route_main(int argc, char *argv[])
		errno = 0;
		}
		goto apply;
		} else if (!strcmp(argv[6], "dev")) {
		rt.rt_flags = RTF_UP;
		rt.rt_dev = argv[7];
		if (set_address(argv[3], &rt.rt_dst) &&
		set_address(argv[5], &rt.rt_genmask)) {
		errno = 0;
		}
		goto apply;
		}
		}
		}

+1 −1

File changed.

Contains only whitespace changes.