failure to find guest ip is not fatal

[build.git] / lbuild-initvm.sh

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 73590e2..59ba47e 100755 (executable)
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -876,7 +876,7 @@ function guest_ipv4() {
     lxc=$1; shift
 
     mac=$(virsh -c lxc:/// domiflist $lxc | grep -E 'network|bridge' | awk '{print $5;}')
-    [ -z "$mac" ] && { echo 1>&2 guest_ipv4_old cannot find mac; return 1; }
+    [ -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
@@ -884,7 +884,7 @@ function guest_ipv4() {
            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_old cannot find ip; return 1; }
+    [ -z "$ip" ] && { echo 1>&2 guest_ipv4 cannot find ip; return 1; }
     echo $ip
 }
 
@@ -905,7 +905,7 @@ function wait_for_ssh () {
     local counter=1
     while [ "$current_time" -lt "$stop_time" ] ; do
         echo "$counter-th attempt to reach sshd in container $lxc ..."
-        [ -z "$guest_ip" ] && guest_ip=$(guest_ipv4 $lxc)
+        [ -z "$guest_ip" ] && guest_ip=$(guest_ipv4 $lxc) || :
         [ -n "$guest_ip" ] && ssh -o "StrictHostKeyChecking no" $guest_ip arch && {
             success=true; echo "SSHD in container $lxc is UP on IP $guest_ip"; break ; } || :
         # some of our boxes have gone through a long upgrade historically, and