summaryrefslogtreecommitdiffstats
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:22:20 +0000
commit5622f546c8fa70d276127d6dfbabe90a48523e2f (patch)
treecb184d2a26622f324b6f884632dc477ff183cdbe
parent75c5760fe8adeae8c4755a1826769b26eba45f40 (diff)
downloadpoky-5622f546c8fa70d276127d6dfbabe90a48523e2f.tar.gz
- 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. (From OE-Core rev: 13041874070ea2235f8c3abe156ae5e940b15f5f) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 = "\
364 Users can add extra features by extending the class or creating a custom class for use 364 Users can add extra features by extending the class or creating a custom class for use
365 with specialized image <filename>.bb</filename> files. 365 with specialized image <filename>.bb</filename> files.
366 </para> 366 </para>
367 <para>
368 Poky ships with two SSH servers you can use in your images: Dropbear and OpenSSH.
369 Dropbear is a minimal SSH server appropriate for resource-constrained environments,
370 while OpenSSH is a well-known standard SSH server implementation.
371 By default, poky-image-sato is configured to use Dropbear.
372 The poky-image-basic and poky-image-lsb images both include OpenSSH.
373 To change these defaults, edit the <filename>IMAGE_FEATURES</filename> variable
374 so that it sets the image you are working with to include ssh-server-dropbear
375 or ssh-server-openssh.
376 </para>
367 </section> 377 </section>
368 378
369 <section id='usingpoky-extend-customimage-localconf'> 379 <section id='usingpoky-extend-customimage-localconf'>