figuring out guest's ipv4 now relies on domiflist and arp - much more robust, and...

[build.git] / build.common

diff --git a/build.common b/build.common
index b248986..fe74e12 100644 (file)
--- a/build.common
+++ b/build.common
@@ -20,7 +20,7 @@ function pl_getDistro() {
        case $distro in Scientific*) distro="SL" ; esac
     elif [ -f /etc/lsb-release ] ; then
        . /etc/lsb-release
-       echo $DISTRIB_CODENAME 
+       distro=$DISTRIB_CODENAME 
     elif [ -f /etc/debian_version ] ; then
        case $(cat /etc/debian_version) in
            6.*) distro=squeeze ;;
@@ -66,7 +66,7 @@ function pl_getReleaseName () {
        [Ss]L*)
            releasename=sl$release
            ;;
-       squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy)
+       squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty|utopic)
            releasename=$distro
            ;;
        *)
@@ -750,3 +750,16 @@ function yumconf_exclude () {
     sed -i -e "/#baseurl=.*$/i\\
 $yumexclude_line" $repo
 }
+
+########################################
+# 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
+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;}'
+}