plc_flavour variables for bootstrapfs selection

diff --git a/Makefile b/Makefile
index efd49d0..82ae384 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,12 @@ tags:
 # (*) otherwise, entering through the root context
 # make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
 
+PLCHOST ?= testplc.onelab.eu
+
 ifdef GUEST
-ifdef PLCHOST
 SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
 SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
 endif
-endif
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)

diff --git a/default_config.xml b/default_config.xml
index 73a27e4..ae4f5e1 100644 (file)
--- a/default_config.xml
+++ b/default_config.xml
@@ -124,6 +124,33 @@ $URL$
       <description>Defaults for nodes and slices contents.</description>
       
       <variablelist>
+       <variable id="node_arch" type="string">
+         <name>arch for nodes</name>
+         <value>@ARCH@</value>
+         <description>The default 'arch' to use when installing nodes.
+         This is offered mostly for consistency with the rest of the
+         PLC_FLAVOUR category, but does not have much of a practical
+         interest. In any case, you need to have the corresponding
+         bootstrapfs images available for nodes.</description>
+       </variable>
+
+       <variable id="node_fcdistro" type="string">
+         <name>fcdistro for nodes</name>
+         <value>@FCDISTRO@</value>
+         <description>THIS CURRENTLY HAS NO EFFECT.
+          The default 'fcdistro' to use when installing
+         nodes.You need to have the corresponding bootstrapfs images
+         available for nodes. THIS CURRENTLY HAS NO EFFECT.</description>
+       </variable>
+
+       <variable id="node_pldistro" type="string">
+         <name>pldistro for nodes</name>
+         <value>@PLDISTRO@</value>
+         <description>The default 'pldistro' to use when installing
+         nodes. You need to have the corresponding bootstrapfs
+         images available for nodes.</description>
+       </variable>
+
        <variable id="slice_arch" type="string">
          <name>arch for slivers</name>
          <value>@ARCH@</value>