diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2017-06-17 14:34:02 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2017-06-17 15:02:58 +0200 |
| commit | 97b58e7eae01ebe5df5d0bfdff4e6154e7ca869b (patch) | |
| tree | 83eb9d534ef9193e0ad8bf7aeb778c85b0ea602e /docs/configuration.md | |
| parent | 260cdaa2b2dcdca9cc9d84c1bc08d00d451c68cd (diff) | |
syz-manager/mgrconfig: move sshkey from vm config to manager config
Sshkey is a property of image, which is in manager config.
Move sshkey to the same location as image.
The motivation for the move is as follows.
Continuous build produces an image and the key,
both need to be passed manager instance.
Continuous build system should not distinguish
different VM types and mess with their configs.
NOTE FOR USERS: this breaks manager configs again.
Hopefully the last time for now. Docs are updated.
Diffstat (limited to 'docs/configuration.md')
| -rw-r--r-- | docs/configuration.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/configuration.md b/docs/configuration.md index 72f12bea7..180affe19 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -16,6 +16,8 @@ following keys in its top-level object: - `leak`: Detect memory leaks with kmemleak. - `image`: Location of the disk image file for the QEMU instance; a copy of this file is passed as the `-hda` option to `qemu-system-x86_64`. + - `sshkey`: Location (on the host machine) of a root SSH identity to use for communicating with + the virtual machine. - `sandbox` : Sandboxing mode, the following modes are supported: - "none": don't do anything special (has false positives, e.g. due to killing init) - "setuid": impersonate into user nobody (65534), default @@ -31,8 +33,6 @@ following keys in its top-level object: - `kernel`: Location of the `bzImage` file for the kernel to be tested; this is passed as the `-kernel` option to `qemu-system-x86_64`. - `cmdline`: Additional command line options for the booting kernel, for example `root=/dev/sda1`. - - `sshkey`: Location (on the host machine) of an SSH identity to use for communicating with - the virtual machine. - `cpu`: Number of CPUs to simulate in the VM (*not currently used*). - `mem`: Amount of memory (in MiB) for the VM; this is passed as the `-m` option to `qemu-system-x86_64`. |