renamed module portforward into bind_public

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index f90d4e6..df808f0 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -16,6 +16,14 @@ transforward-SPEC := transforward.spec
 ALL += transforward
 IN_NODEIMAGE += transforward
 
+#
+# procprotect: root context module for protecting against weaknesses in /proc
+#
+procprotect-MODULES := procprotect
+procprotect-SPEC := procprotect.spec
+ALL += procprotect
+IN_NODEIMAGE += procprotect
+
 #
 # ipfw: root context module, and slice companion
 #
@@ -26,9 +34,6 @@ IN_NODEIMAGE += ipfwroot
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
-ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
-        kernel_release=$(kernel.rpm-release) \
-        kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwslice
 
 #
@@ -48,12 +53,17 @@ ALL += ipod
 IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# nodemanager
 #
-nodemanager-MODULES := nodemanager
-nodemanager-SPEC := NodeManager.spec
-ALL += nodemanager
-IN_NODEIMAGE += nodemanager
+nodemanager-lib-MODULES := nodemanager
+nodemanager-lib-SPEC := nodemanager-lib.spec
+ALL += nodemanager-lib
+IN_NODEIMAGE += nodemanager-lib
+
+nodemanager-lxc-MODULES := nodemanager
+nodemanager-lxc-SPEC := nodemanager-lxc.spec
+ALL += nodemanager-lxc
+IN_NODEIMAGE += nodemanager-lxc
 
 #
 # pl_sshd
@@ -79,6 +89,13 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_NODEIMAGE += fprobe-ulog
 
+#################### libvirt on f16 is too old, sounds like f17 has something fine
+local_libvirt=false
+ifeq "$(DISTRONAME)" "f16"
+local_libvirt=true
+endif
+
+ifeq "$(local_libvirt)" "true"
 #
 # libvirt
 #
@@ -99,6 +116,7 @@ libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without sto
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt
+endif
 
 #
 # DistributedRateLimiting
@@ -185,6 +203,14 @@ vsys-scripts-SPEC := vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
+#
+# bind_public
+#
+bind_public-MODULES := bind_public
+bind_public-SPEC := bind_public.spec
+IN_SLICEIMAGE += bind_public
+ALL += bind_public
+
 #
 # plcapi
 #