summaryrefslogtreecommitdiff
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2011-03-17 07:41:33 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-18 17:20:44 +0000
commit13041874070ea2235f8c3abe156ae5e940b15f5f (patch)
tree3137b1eaa7e55eb38b499f23b6135b690831c53b /documentation
parentf4305f960cb788d73c5132aa5a9f930e85c20385 (diff)
downloadopenembedded-core-13041874070ea2235f8c3abe156ae5e940b15f5f.tar.gz
openembedded-core-13041874070ea2235f8c3abe156ae5e940b15f5f.tar.bz2
openembedded-core-13041874070ea2235f8c3abe156ae5e940b15f5f.zip
[BUGID# 293] - documentation/poky-ref-manual/extendpoky.xml: Added text for choosing server
[BUGID# 293] - I added text at the end of section 3.2.3 "Customizing Images Using Custom IMAGE_FEATURES" to include explanation of the two servers Poky uses for images by default. Also how to change the variable IMAGE_FEATURES to configure the server. This change is part of the fix for BUGID# 293 and was suggested by Scott Garman. Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/poky-ref-manual/extendpoky.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/documentation/poky-ref-manual/extendpoky.xml b/documentation/poky-ref-manual/extendpoky.xml
index 182b36d51a..d7d2c6cdde 100644
--- a/documentation/poky-ref-manual/extendpoky.xml
+++ b/documentation/poky-ref-manual/extendpoky.xml
@@ -364,6 +364,16 @@ RRECOMMENDS_task-custom-tools = "\
Users can add extra features by extending the class or creating a custom class for use
with specialized image <filename>.bb</filename> files.
</para>
+ <para>
+ Poky ships with two SSH servers you can use in your images: Dropbear and OpenSSH.
+ Dropbear is a minimal SSH server appropriate for resource-constrained environments,
+ while OpenSSH is a well-known standard SSH server implementation.
+ By default, poky-image-sato is configured to use Dropbear.
+ The poky-image-basic and poky-image-lsb images both include OpenSSH.
+ To change these defaults, edit the <filename>IMAGE_FEATURES</filename> variable
+ so that it sets the image you are working with to include ssh-server-dropbear
+ or ssh-server-openssh.
+ </para>
</section>
<section id='usingpoky-extend-customimage-localconf'>