From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 8 Jan 2014 07:40:02 +0000 (+0100)
Subject: switch to using stock libvirt onf 20
X-Git-Tag: before_libvirt_121~99
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=6a6805a6e764e37642fc7db90fb3f4e31e5ee039

switch to using stock libvirt onf 20
---

diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index ddede073..66bbd04e 100644
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -124,3 +124,5 @@ package: planetlab-umts-tools-backend ppp comgt
 ### convenience
 package: less
 package: emacs-nox
+
+package>=f20: libvirt
diff --git a/lxc.mk b/lxc.mk
index 55d5609a..ecfabc07 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -135,11 +135,11 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_NODEIMAGE += fprobe-ulog
 
-#################### using our own libvirt on all distros for now
-#local_libvirt=false
-#ifeq "$(DISTRONAME)" "f16"
+#################### using our own libvirt on f18, and the stock version later on
+local_libvirt=false
+ifeq "$(DISTRONAME)" "f18"
 local_libvirt=true
-#endif
+endif
 
 ifeq "$(local_libvirt)" "true"
 #