X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-nightly.sh;h=f7144e52fb73d8c234954d8838279967804aeeb5;hb=139959af774cdf79520850293c4060c1d4f94f66;hp=3d6090107d6245680a4bb1ba78e77be133146fe7;hpb=2d32d9d4baa2916386063103319e217e27f2b2d7;p=build.git

diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh
index 3d609010..f7144e52 100755
--- a/lbuild-nightly.sh
+++ b/lbuild-nightly.sh
@@ -60,10 +60,17 @@ function logfile () {
 function guest_ipv4() {
     lxc=$1; shift
 
-    mac=$(virsh -c lxc:/// domiflist $lxc | egrep 'network|bridge' | awk '{print $5;}')
-    # sanity check
-    [ -z "$mac" ] && return 0
-    arp -en | grep "$mac" | awk '{print $1;}'
+    mac=$(virsh -c lxc:/// domiflist $lxc | grep -E 'network|bridge' | awk '{print $5;}')
+    [ -z "$mac" ] && { echo 1>&2 guest_ipv4 cannot find mac; return 1; }
+    ip=$(arp -en | grep "$mac" | awk '{print $1;}')
+    # if not known: run a ping and try again
+    if [ -z $ip ]; then
+	    ping -c1 -w1 -W1 $lxc >& /dev/null
+	    ping -c1 -w1 -W1 $lxc.pl.sophia.inria.fr >& /dev/null
+	    ip=$(arp -en | grep "$mac" | awk '{print $1;}')
+    fi
+    [ -z "$ip" ] && { echo 1>&2 guest_ipv4 cannot find ip; return 1; }
+    echo $ip
 }
 
 # wrap a quick summary of suspicious stuff