From ae04d055cb95f6a059979e2ea832eb85ef84b9a6 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Sat, 4 Nov 2023 10:20:39 +0100 Subject: [PATCH] remove _old --- lbuild-initvm.sh | 4 ++-- lbuild-nightly.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index 73590e24..9dc96c08 100755 --- 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 } diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh index 42db238a..f7144e52 100755 --- 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;}') - [ -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 @@ -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 - [ -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 } -- 2.43.0