tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp

Browse source 
Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
This commit is contained in:
Jean-Baptiste Queru 2010-07-29 15:53:16 -07:00
commit 60c8f863ca
3 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rootdir/etc/init.goldfish.sh
View file

@ -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

2
toolbox/Android.mk
View file

@ -41,7 +41,7 @@ TOOLS := \
printenv \
smd \
chmod \
chown \
chown \
newfs_msdos \
netstat \
ioctl \

24
toolbox/route.c
View file

@ -80,14 +80,24 @@ 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")) {
rt.rt_flags = RTF_UP | RTF_GATEWAY;
if (set_address(argv[3], &rt.rt_dst) &&
set_address(argv[5], &rt.rt_genmask) &&
set_address(argv[7], &rt.rt_gateway)) {
errno = 0;
!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) &&
set_address(argv[7], &rt.rt_gateway)) {
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;
}
goto apply;
}
}