IN_NODEIMAGE += ipod
#
-# NodeManager
+# plnode-utils
+#
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-vs.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
+#
+# 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-vs-MODULES := nodemanager
+nodemanager-vs-SPEC := nodemanager-vs.spec
+ALL += nodemanager-vs
+IN_NODEIMAGE += nodemanager-vs
#
# pl_sshd
#
# PlanetLab Mom: Cleans up your mess
#
-mom-MODULES := Mom
+mom-MODULES := mom
mom-SPEC := pl_mom.spec
ALL += mom
IN_NODEIMAGE += mom
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
# vsys-scripts
#
vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts