X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-nightly.sh;h=fd7809a53474d5f93c224adb9a2733413adf6a4c;hb=14bda0bc34e832c24209b18d0d0c0fcb04a4d950;hp=6ffeb66e2822f932aad1fed587cb51474d43ab47;hpb=a18f1433cc148d9e96d00bdd975d422758de2811;p=build.git

diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh
index 6ffeb66e..fd7809a5 100755
--- a/lbuild-nightly.sh
+++ b/lbuild-nightly.sh
@@ -52,6 +52,20 @@ function logfile () {
     echo /vservers/$slice.log.txt
 }
 
+########################################
+# workaround for broken lxc-enter-namespace
+# 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() {
+    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;}'
+}
+
 # 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
@@ -231,13 +245,6 @@ function in_root_context () {
     rpm -q libvirt > /dev/null 
 }
 
-### lxc-enter-namespace being broken, let us try to work around this issue
-# lbuild-initvm.sh stores the guest ipv4 address in /vservers/<container>/ipv4
-function guest_ipv4 () {
-    buildname=$1; shift
-    cat /vservers/$buildname/ipv4
-}
-    
 # convenient for simple commands
 function run_in_build_guest () {
     buildname=$1; shift