Merge branch 'master' of ssh://git.onelab.eu/git/build

diff --git a/lxc.mk b/lxc.mk
index 25658a5..7b382bc 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -155,14 +155,14 @@ endif
 #
 # openvswitch
 #
-openvswitch-MODULES := openvswitch
-openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-IN_NODEIMAGE += openvswitch
-# build only on f14 as f16 has this natively
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)"
-ALL += openvswitch
-endif
+# openvswitch-MODULES := openvswitch
+# openvswitch-SPEC := openvswitch.spec
+# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+# IN_NODEIMAGE += openvswitch
+# # build only on f14 as f16 has this natively
+# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)"
+# ALL += openvswitch
+# endif
 
 #
 # vsys

diff --git a/planetlab.mk b/planetlab.mk
index 810aedd..ae3f623 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -232,10 +232,10 @@ openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
 openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
 
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
-IN_NODEIMAGE += openvswitch
-ALL += openvswitch
-endif
+#ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
+#IN_NODEIMAGE += openvswitch
+#ALL += openvswitch
+#endif
 
 #
 # vsys

diff --git a/vbuild-init-lxc.sh b/vbuild-init-lxc.sh
index cb3c208..7450a89 100755 (executable)
--- a/vbuild-init-lxc.sh
+++ b/vbuild-init-lxc.sh
@@ -560,8 +560,6 @@ function setup_lxc() {
     # start container
     lxc-start -d -n $lxc
 
-    lxc-wait -n $lxc -s RUNNING
-
     echo $IP is up, waiting for ssh...
 
     # wait max 5 min for sshd to start