summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-08-13 08:15:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-14 09:34:57 +0100
commiteea510cfd3ad31ae74727873cc6d27bb273c4040 (patch)
tree983e52d88eeb14e6ced8729e8426ee62c7cc340b /documentation/dev-manual
parent8b8748c8f963900b83dc0fdd7757556f917fe4fd (diff)
downloadpoky-eea510cfd3ad31ae74727873cc6d27bb273c4040.tar.gz
documentation/dev-manual: modified SSH server discussion for QEMU Images
Two areas of the manual updated to reflect the fact that not all QEMU images have an SSH server in them. Reported-by: Robert P. J. Day <rpjday@crashcourse.ca> (From yocto-docs rev: a173d8cb05ee695b02188a037ee047db016c6a67) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual')
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml1
-rw-r--r--documentation/dev-manual/dev-manual-start.xml15
2 files changed, 11 insertions, 5 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index b8708ff19f..018bc52199 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -580,6 +580,7 @@
580 By default, the <filename>core-image-sato</filename> image is configured to use Dropbear. 580 By default, the <filename>core-image-sato</filename> image is configured to use Dropbear.
581 The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename> 581 The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename>
582 images both include OpenSSH. 582 images both include OpenSSH.
583 The <filename>core-image-minimal</filename> image does not contain an SSH server.
583 To change these defaults, edit the <filename>IMAGE_FEATURES</filename> variable 584 To change these defaults, edit the <filename>IMAGE_FEATURES</filename> variable
584 so that it sets the image you are working with to include 585 so that it sets the image you are working with to include
585 <filename>ssh-server-dropbear</filename> or <filename>ssh-server-openssh</filename>. 586 <filename>ssh-server-dropbear</filename> or <filename>ssh-server-openssh</filename>.
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml
index a004004ed2..989437c6c0 100644
--- a/documentation/dev-manual/dev-manual-start.xml
+++ b/documentation/dev-manual/dev-manual-start.xml
@@ -360,11 +360,16 @@
360 If so, you can configure the operating system of the running image 360 If so, you can configure the operating system of the running image
361 to use that port to run a console. 361 to use that port to run a console.
362 The connection uses standard IP networking.</para></listitem> 362 The connection uses standard IP networking.</para></listitem>
363 <listitem><para>The QEMU images have a Dropbear secure shell (ssh) server 363 <listitem><para>SSH servers exist in some QEMU images.
364 that runs with the root password disabled. 364 The <filename>core-image-sato</filename> QEMU image has a Dropbear secure
365 This allows you to use standard <filename>ssh</filename> and 365 shell (ssh) server that runs with the root password disabled.
366 <filename>scp</filename> commands.</para></listitem> 366 The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename> QEMU images
367 <listitem><para>The QEMU images also contain an embedded Network File 367 have OpenSSH instead of Dropbear.
368 Including these SSH servers allow you to use standard <filename>ssh</filename> and
369 <filename>scp</filename> commands.
370 The <filename>core-image-minimal</filename> QEMU image, however, contains no ssh
371 server.</para></listitem>
372 <listitem><para>The QEMU images also can be contain an embedded Network File
368 System (NFS) server that exports the image's root filesystem. 373 System (NFS) server that exports the image's root filesystem.
369 This allows you to make the filesystem available to the 374 This allows you to make the filesystem available to the
370 host.</para></listitem> 375 host.</para></listitem>