summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-12-01 14:51:50 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-12-01 14:51:50 +0000
commit65634e78046489b7e50edf2a36f67a816fd51573 (patch)
treed6c90fdda0f034efac0996d9d413f877fee69b50
parent24fc4e3e56e5808a3c23225d636c884d1de8e39f (diff)
parentcd32e633d525135214a846ea8d8be43586017ce9 (diff)
downloaddefinitions-65634e78046489b7e50edf2a36f67a816fd51573.tar.gz
Merge branch 'master' of https://github.com/petefoth/morph
This merges in more documentation improvements Reviewed-by: Richard Maw
-rw-r--r--kvm.write.help11
-rw-r--r--virtualbox-ssh.write.help2
2 files changed, 10 insertions, 3 deletions
diff --git a/kvm.write.help b/kvm.write.help
index a9b63303..db2c0d97 100644
--- a/kvm.write.help
+++ b/kvm.write.help
@@ -1,6 +1,8 @@
help: |
- Create a KVM/LibVirt virtual machine during Morph's deployment.
+ Deploy a Baserock system as a *new* KVM/LibVirt virtual machine.
+
+ Use the `ssh-rsync` write extension to deploy upgrades to an *existing* VM
Parameters:
@@ -37,5 +39,8 @@ help: |
* INITRAMFS_PATH=path: the location of an initramfs for the bootloader to
tell Linux to use, rather than booting the rootfs directly.
- * AUTOSTART=<VALUE>` - allowed values are `yes` and `no` (default). If the
- value is 'yes', the VM will be started when it has been deployed
+ * AUTOSTART=<VALUE>` - boolean. If it is set, the VM will be started when
+ it has been deployed.
+
+ (See `morph help deploy` for details of how to pass parameters to write extensions)
+
diff --git a/virtualbox-ssh.write.help b/virtualbox-ssh.write.help
index a19d8fb2..ad2a83eb 100644
--- a/virtualbox-ssh.write.help
+++ b/virtualbox-ssh.write.help
@@ -82,3 +82,5 @@ help: |
See Chapter 6 of the VirtualBox User Manual for more information about
virtual networking (https://www.virtualbox.org/manual/ch06.html)
+
+ (See `morph help deploy` for details of how to pass parameters to write extensions)