aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/manual.cli21
1 files changed, 17 insertions, 4 deletions
diff --git a/doc/manual.cli b/doc/manual.cli
index dc8dd37..a851008 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -203,8 +203,9 @@ id: <machine-id>
name: <machine-name>
summary: <string>
-type: <machine-type>
-mac: <macaddr>
+type: <machine-type>
+mac: <macaddr>
+options: <machine-options>
\
The build machine manifest contains the complete description of a build
@@ -231,7 +232,19 @@ the header values must appear before any non-header values.
If it is not specified, then a random address is generated on the first
machine bootstrap which is then reused for each build/re-bootstrap. Note
that it you specify a fixed address, then the machine can only be used by a
- single \c{bbot} agent.
+ single \c{bbot} agent.|
+
+
+\li|\n\c{options: <machine-options>}\n
+
+ Optional list of machine options. The exact semantics is machine
+ type-dependent (see below). A single level of quotes (either single or
+ double) is removed in each option before being passed on. Options can be
+ separated with spaces or newlines.
+
+ For \c{kvm} machines, if this value is present, then it replaces the
+ default network and disk configuration when starting the QEMU/KVM
+ hypervisor.
||
@@ -414,7 +427,7 @@ starts with the task request manifest followed by a list of machine manifests.
not to use the certificate-based authentication in which case it does not
include this value. However, the controller may be configured to require
the authentication in which case it will respond with the
- 401 (unauthorized) HTTP status code.|
+ 401 (unauthorized) HTTP status code.||
\h#arch-task-res-manifest|Task Response Manifest|