X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=a5193103d5f922d46120bd4fe313ad985ea505e0;hb=1f91236d83fb7d5aec6ac6832ad3f6fa67c36ed9;hp=5245a3ad456fad834cf83bf88a1cebbab2d7b3e6;hpb=6905a2f3ba95975c38df315275d20054d8f4ac6b;p=build.git

diff --git a/lxc.mk b/lxc.mk
index 5245a3ad..a5193103 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -30,10 +30,14 @@ IN_NODEIMAGE += transforward
 #
 # procprotect: root context module for protecting against weaknesses in /proc
 #
+### an attempt to remove procprotect from the nodes on f21 now that it has 3.19
+# xxx if that works then we should also tweak nodeimage.pkgs accordingly
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)"
 procprotect-MODULES := procprotect
 procprotect-SPEC := procprotect.spec
 ALL += procprotect
 IN_NODEIMAGE += procprotect
+endif
 
 #
 # ipfw: root context module, and slice companion
@@ -122,8 +126,8 @@ IN_NODEIMAGE += codemux
 #
 # fprobe-ulog
 #
-# xxx temporarily turning this off on f21
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)"
+# xxx temporarily turning this off on f20 and f21
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21)"
 fprobe-ulog-MODULES := fprobe-ulog
 fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
@@ -157,6 +161,7 @@ libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
 libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
 # 1.2.11
 libvirt-STOCK-DEVEL-RPMS += wireshark-devel
+libvirt-STOCK-DEVEL-RPMS += ceph-devel-compat
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt