summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-07-29 15:04:57 -0700
committerAndroid Code Review <code-review@android.com>2010-07-29 15:04:57 -0700
commit0fcbdb4147858d40d581d3b034f5150962632943 (patch)
treef8d60bd03a6ff4d9f0efdded6448bf764fa76a4d /rootdir
parentc37ba1c916d73fbf35c6faba1e252e2916d2d41d (diff)
parent2a743730c7d1a8adba8a922f7af46cef0b35363a (diff)
downloadsystem_core-0fcbdb4147858d40d581d3b034f5150962632943.zip
system_core-0fcbdb4147858d40d581d3b034f5150962632943.tar.gz
system_core-0fcbdb4147858d40d581d3b034f5150962632943.tar.bz2
Merge "Userland support for VM interconnection"
Diffstat (limited to 'rootdir')
-rwxr-xr-xrootdir/etc/init.goldfish.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/rootdir/etc/init.goldfish.sh b/rootdir/etc/init.goldfish.sh
index 5ff0a3a..cfa2c82 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