| commit | ed8b8ebc21b9da5499eedc374a91bd155a64b4c2 | [log] [tgz] |
|---|---|---|
| author | anbangx <anbangx@123451ca-8445-de46-9d55-352943316053> | Mon Mar 25 08:23:28 2013 +0000 |
| committer | anbangx <anbangx@123451ca-8445-de46-9d55-352943316053> | Mon Mar 25 08:23:28 2013 +0000 |
| tree | 49b987f40f5189f11a10faf60126012c62372380 | |
| parent | b9dd63c1705cf84afbe71410b2086f602a3426a6 [diff] [blame] |
svn merge -r3112:3163 https://hyracks.googlecode.com/svn/branches/fullstack_asterix_stabilization svn merge -r3173:3188 https://hyracks.googlecode.com/svn/branches/fullstack_release_candidate@3234 svn merge -r3209:3233 https://hyracks.googlecode.com/svn/trunk/fullstack git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_genomix@3237 123451ca-8445-de46-9d55-352943316053
diff --git a/hivesterix/hivesterix-dist/src/main/resources/scripts/getip.sh b/hivesterix/hivesterix-dist/src/main/resources/scripts/getip.sh index e0cdf73..8c9ae76 100755 --- a/hivesterix/hivesterix-dist/src/main/resources/scripts/getip.sh +++ b/hivesterix/hivesterix-dist/src/main/resources/scripts/getip.sh
@@ -8,6 +8,10 @@ IPADDR=`/sbin/ifconfig eth0 | grep "inet " | awk '{print $2}' | cut -f 2 -d ':'` if [ "$IPADDR" = "" ] then + IPADDR=`/sbin/ifconfig em1 | grep "inet " | awk '{print $2}' | cut -f 2 -d ':'` + fi + if [ "$IPADDR" = "" ] + then IPADDR=`/sbin/ifconfig lo | grep "inet " | awk '{print $2}' | cut -f 2 -d ':'` fi else