X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-nightly.sh;h=9991abe2ff2145c4fd29c7d01534197b521aa663;hb=refs%2Fheads%2Fmaster;hp=42db238a5baa2d8ac9fe994b1b196598220e42b1;hpb=c6c09e2eb5531922e7980f974782c72328566923;p=build.git

diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh
index 42db238a..9991abe2 100755
--- a/lbuild-nightly.sh
+++ b/lbuild-nightly.sh
@@ -57,7 +57,7 @@ function logfile () {
 # 1st version was relying on virsh net-dhcp-leases
 # however this was too fragile, would not work for fedora14 containers
 # WARNING: this code is duplicated in lbuild-initvm.sh
-function guest_ipv4() {
+function guest_ipv4_old() {
     lxc=$1; shift
 
     mac=$(virsh -c lxc:/// domiflist $lxc | grep -E 'network|bridge' | awk '{print $5;}')
@@ -73,6 +73,24 @@ function guest_ipv4() {
     echo $ip
 }
 
+function guest_ipv4() {
+    lxc=$1; shift
+
+    # this gives us the libvirt_lxc pid for the container
+    local lxc_pid=$(virsh -c lxc:/// dominfo $lxc | grep '^Id:' | awk '{print $2;}' | sed -e "s|-||g")
+    [[ -z "$lxc_pid" ]] && { echo 1>&2 guest_ipv4 cannot find lxc pid; return 1; }
+    # but we need the systemd (pid=1) instance for the container
+    local systemd_pid=$(pgrep -P $lxc_pid systemd)
+    [[ -z "$systemd_pid" ]] && { echo 1>&2 guest_ipv4 cannot systemd pid; return 1; }
+    # from there we can inspect the network interfaces
+    local domip=$(nsenter -t $systemd_pid -n ip -br addr show eth0 \
+                 | awk '{print $3}' \
+                 | cut -d/ -f1 \
+                 )
+    [ -z "$domip" ] && { echo 1>&2 guest_ipv4 cannot find ip; return 1; }
+    echo $domip
+}
+
 # wrap a quick summary of suspicious stuff
 # this is to focus on installation that go wrong
 # use with care, a *lot* of other things can go bad as well