remove _old

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 73590e2..9dc96c0 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;}')
     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
     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
            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
 }
 
     echo $ip
 }
 

diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh
index 42db238..f7144e5 100755 (executable)
--- a/lbuild-nightly.sh
+++ b/lbuild-nightly.sh
@@ -61,7 +61,7 @@ function guest_ipv4() {
     lxc=$1; shift
 
     mac=$(virsh -c lxc:/// domiflist $lxc | grep -E 'network|bridge' | awk '{print $5;}')
     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
     ip=$(arp -en | grep "$mac" | awk '{print $1;}')
     # if not known: run a ping and try again
     if [ -z $ip ]; then


@@ -69,7 +69,7 @@ function guest_ipv4() {
            ping -c1 -w1 -W1 $lxc.pl.sophia.inria.fr >& /dev/null
            ip=$(arp -en | grep "$mac" | awk '{print $1;}')
     fi
            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
 }
 
     echo $ip
 }