switch to using stock libvirt onf 20

diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index ddede07..66bbd04 100644 (file)
--- 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 55d5609..ecfabc0 100644 (file)
--- 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"
 #