diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-12-01 14:51:50 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-12-01 14:51:50 +0000 |
| commit | 1a32c137eb99e0a265c8afd99491bfb400b78c77 (patch) | |
| tree | 39088922a8ae27e5782a0da5799a48f42c3a7dd9 | |
| parent | dc16a9dc1b2900ac6d98a259f3688041f3313f96 (diff) | |
| parent | 9a31418847f6fbbdc64f5d0693a7c3d54162f20f (diff) | |
| download | morph-1a32c137eb99e0a265c8afd99491bfb400b78c77.tar.gz | |
Merge branch 'master' of https://github.com/petefoth/morph
This merges in more documentation improvements
Reviewed-by: Richard Maw
| -rw-r--r-- | morphlib/exts/kvm.write.help | 11 | ||||
| -rw-r--r-- | morphlib/exts/virtualbox-ssh.write.help | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/morphlib/exts/kvm.write.help b/morphlib/exts/kvm.write.help index a9b63303..db2c0d97 100644 --- a/morphlib/exts/kvm.write.help +++ b/morphlib/exts/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/morphlib/exts/virtualbox-ssh.write.help b/morphlib/exts/virtualbox-ssh.write.help index a19d8fb2..ad2a83eb 100644 --- a/morphlib/exts/virtualbox-ssh.write.help +++ b/morphlib/exts/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) |