From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 20 Mar 2014 11:24:10 +0000 (+0100)
Subject: little tweaks for using with production VMs
X-Git-Tag: 5.3.2~32
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=6421c6b5d11d7d0361c91c0402c554e3931940d3

little tweaks for using with production VMs
---

diff --git a/lbuild-bridge.sh b/lbuild-bridge.sh
index ecee98b5..6bf317ea 100755
--- a/lbuild-bridge.sh
+++ b/lbuild-bridge.sh
@@ -22,6 +22,7 @@ for line in file("/proc/net/dev"):
     if ifname.find("virbr")==0: continue
     if ifname.find("veth")==0: continue
     if ifname.find("tap")==0: continue
+    if ifname.find("vif")==0: continue
     print ifname
 EOF
 }
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 5f51503a..1babde38 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -441,7 +441,7 @@ function setup_lxc() {
     esac
 
     # Enable cgroup -- xxx -- is this really useful ?
-    mkdir $lxc_root/cgroup
+    [ -d $lxc_root/cgroup ] || mkdir $lxc_root/cgroup
     
     # set up resolv.conf
     cp /etc/resolv.conf $lxc_root/etc/resolv.conf
@@ -860,7 +860,7 @@ function main () {
 	masklen=$(ip addr show $PUBLIC_BRIDGE | grep -v inet6 | grep inet | awk '{print $2;}' | cut -d/ -f2)
         NETMASK=$(masklen_to_netmask $masklen)
         GATEWAY=$(ip route show | grep default | awk '{print $3}' | head -1)
-        VIF_HOST="i$(echo $GUEST_HOSTNAME | cut -d. -f1)"
+        VIF_HOST="vif_$(echo $GUEST_HOSTNAME | cut -d. -f1)"
     fi
 
     setup_lxc $lxc $fcdistro $pldistro $personality