diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-29 15:53:16 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-07-29 15:53:16 -0700 |
| commit | 60c8f863ca84f3e5bb8e78d8001c53511f094d53 (patch) | |
| tree | 0af3cd99e4e85251ae4b32a4967e03b6e5e8716f /rootdir | |
| parent | 42b871f1bfc116d53d1bff9d7497415494b2e0e0 (diff) | |
| parent | 0fcbdb4147858d40d581d3b034f5150962632943 (diff) | |
| download | system_core-60c8f863ca84f3e5bb8e78d8001c53511f094d53.tar.gz system_core-60c8f863ca84f3e5bb8e78d8001c53511f094d53.tar.bz2 system_core-60c8f863ca84f3e5bb8e78d8001c53511f094d53.zip | |
resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
Diffstat (limited to 'rootdir')
| -rwxr-xr-x | rootdir/etc/init.goldfish.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/rootdir/etc/init.goldfish.sh b/rootdir/etc/init.goldfish.sh index 5ff0a3a4..cfa2c828 100755 --- a/rootdir/etc/init.goldfish.sh +++ b/rootdir/etc/init.goldfish.sh @@ -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 |