ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am eeeca4dd: rootdir: goldfish: Fix network route during emulation.

Browse source 
* commit 'eeeca4dd45899c20d4fc187c59bda58af43352f2':
  rootdir: goldfish: Fix network route during emulation.
This commit is contained in:
David 'Digit' Turner 2011-01-18 18:35:56 -08:00 • committed by Android Git Automerger
commit 794fb914be
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rootdir/etc/init.goldfish.rc
View file

@ -6,6 +6,7 @@ on early-init
on boot on boot
setprop ARGH ARGH setprop ARGH ARGH
setprop net.eth0.gw 10.0.2.2
setprop net.eth0.dns1 10.0.2.3 setprop net.eth0.dns1 10.0.2.3
setprop net.gprs.local-ip 10.0.2.15 setprop net.gprs.local-ip 10.0.2.15
setprop ro.radio.use-ppp no setprop ro.radio.use-ppp no

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

@ -1,8 +1,26 @@
#!/system/bin/sh #!/system/bin/sh
# Setup networking when boot starts
ifconfig eth0 10.0.2.15 netmask 255.255.255.0 up ifconfig eth0 10.0.2.15 netmask 255.255.255.0 up
route add default gw 10.0.2.2 dev eth0 route add default gw 10.0.2.2 dev eth0
# ro.kernel.android.qemud is normally set when we
# want the RIL (radio interface layer) to talk to
# the emulated modem through qemud.
#
# However, this will be undefined in two cases:
#
# - When we want the RIL to talk directly to a guest
# serial device that is connected to a host serial
# device by the emulator.
#
# - We don't want to use the RIL but the VM-based
# modem emulation that runs inside the guest system
# instead.
#
# The following detects the latter case and sets up the
# system for it.
#
qemud=`getprop ro.kernel.android.qemud` qemud=`getprop ro.kernel.android.qemud`
case "$qemud" in case "$qemud" in
"") "")
@ -18,17 +36,18 @@ case "$qemud" in
;; ;;
esac esac
# Setup additionnal DNS servers if needed
num_dns=`getprop ro.kernel.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
;; ;;
3) setprop net.eth0.dns2 10.0.2.4 3) setprop net.eth0.dns2 10.0.2.4
setprop net.eth0.dns3 10.0.2.5 setprop net.eth0.dns3 10.0.2.5
;; ;;
4) setprop net.eth0.dns2 10.0.2.4 4) setprop net.eth0.dns2 10.0.2.4
setprop net.eth0.dns3 10.0.2.5 setprop net.eth0.dns3 10.0.2.5
setprop net.eth0.dns4 10.0.2.6 setprop net.eth0.dns4 10.0.2.6
;; ;;
esac esac
# disable boot animation for a faster boot sequence when needed # disable boot animation for a faster boot sequence when needed
@ -42,10 +61,6 @@ esac
# #
/system/bin/qemu-props /system/bin/qemu-props
# 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) # set up the second interface (for inter-emulator connections)
# if required # if required
my_ip=`getprop net.shared_net_ip` my_ip=`getprop net.shared_net_ip`