diff options
Diffstat (limited to 'documentation/dev-manual')
-rw-r--r-- | documentation/dev-manual/dev-manual-common-tasks.xml | 2 | ||||
-rw-r--r-- | documentation/dev-manual/dev-manual-start.xml | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml index 805badaa07..ec1e8fcc66 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/documentation/dev-manual/dev-manual-common-tasks.xml | |||
@@ -1017,7 +1017,7 @@ | |||
1017 | well-known standard SSH server implementation. | 1017 | well-known standard SSH server implementation. |
1018 | By default, the <filename>core-image-sato</filename> image | 1018 | By default, the <filename>core-image-sato</filename> image |
1019 | is configured to use Dropbear. | 1019 | is configured to use Dropbear. |
1020 | The <filename>core-image-basic</filename> and | 1020 | The <filename>core-image-full-cmdline</filename> and |
1021 | <filename>core-image-lsb</filename> images both | 1021 | <filename>core-image-lsb</filename> images both |
1022 | include OpenSSH. | 1022 | include OpenSSH. |
1023 | The <filename>core-image-minimal</filename> image does not | 1023 | The <filename>core-image-minimal</filename> image does not |
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml index 05cb8fc9d9..deea5a7610 100644 --- a/documentation/dev-manual/dev-manual-start.xml +++ b/documentation/dev-manual/dev-manual-start.xml | |||
@@ -368,15 +368,19 @@ | |||
368 | If so, you can configure the operating system of the running image | 368 | If so, you can configure the operating system of the running image |
369 | to use that port to run a console. | 369 | to use that port to run a console. |
370 | The connection uses standard IP networking.</para></listitem> | 370 | The connection uses standard IP networking.</para></listitem> |
371 | <listitem><para>SSH servers exist in some QEMU images. | 371 | <listitem><para> |
372 | The <filename>core-image-sato</filename> QEMU image has a Dropbear secure | 372 | SSH servers exist in some QEMU images. |
373 | shell (SSH) server that runs with the root password disabled. | 373 | The <filename>core-image-sato</filename> QEMU image has a |
374 | The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename> QEMU images | 374 | Dropbear secure shell (SSH) server that runs with the root |
375 | password disabled. | ||
376 | The <filename>core-image-full-cmdline</filename> and | ||
377 | <filename>core-image-lsb</filename> QEMU images | ||
375 | have OpenSSH instead of Dropbear. | 378 | have OpenSSH instead of Dropbear. |
376 | Including these SSH servers allow you to use standard <filename>ssh</filename> and | 379 | Including these SSH servers allow you to use standard |
377 | <filename>scp</filename> commands. | 380 | <filename>ssh</filename> and <filename>scp</filename> commands. |
378 | The <filename>core-image-minimal</filename> QEMU image, however, contains no SSH | 381 | The <filename>core-image-minimal</filename> QEMU image, |
379 | server.</para></listitem> | 382 | however, contains no SSH server. |
383 | </para></listitem> | ||
380 | <listitem><para>You can use a provided, user-space NFS server to boot the QEMU session | 384 | <listitem><para>You can use a provided, user-space NFS server to boot the QEMU session |
381 | using a local copy of the root filesystem on the host. | 385 | using a local copy of the root filesystem on the host. |
382 | In order to make this connection, you must extract a root filesystem tarball by using the | 386 | In order to make this connection, you must extract a root filesystem tarball by using the |