NodeManager replaced by nodemanager-vs (and thus nodemanager-lib)

diff --git a/config.planetlab/nodeimage.pkgs b/config.planetlab/nodeimage.pkgs
index bb959d3..91582a2 100644 (file)
--- a/config.planetlab/nodeimage.pkgs
+++ b/config.planetlab/nodeimage.pkgs
@@ -110,7 +110,10 @@ package: util-vserver-sysv
 package: util-vserver-legacy
 package: util-vserver-pl
 #package: util-python
+# temporary, so we can build planetlab and onelab
 package: NodeManager
+# temporary
+package: nodemanager-vs
 package: NodeUpdate
 package: codemux
 package: pl_sshd

diff --git a/onelab.mk b/onelab.mk
index 2efb39d..9a79651 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -182,10 +182,15 @@ IN_NODEIMAGE += ipod
 #
 # 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

diff --git a/planetlab.mk b/planetlab.mk
index ae3f623..3034593 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -152,10 +152,15 @@ IN_NODEIMAGE += ipod
 #
 # 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