summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual
diff options
context:
space:
mode:
Diffstat (limited to 'documentation/dev-manual')
-rw-r--r--documentation/dev-manual/customizing-images.rst17
-rw-r--r--documentation/dev-manual/qemu.rst11
2 files changed, 13 insertions, 15 deletions
diff --git a/documentation/dev-manual/customizing-images.rst b/documentation/dev-manual/customizing-images.rst
index 17dd2d2b0c..3946073052 100644
--- a/documentation/dev-manual/customizing-images.rst
+++ b/documentation/dev-manual/customizing-images.rst
@@ -80,15 +80,14 @@ recipe that are enabled with :term:`IMAGE_FEATURES`. The value of
80:term:`EXTRA_IMAGE_FEATURES` is added to :term:`IMAGE_FEATURES` within 80:term:`EXTRA_IMAGE_FEATURES` is added to :term:`IMAGE_FEATURES` within
81``meta/conf/bitbake.conf``. 81``meta/conf/bitbake.conf``.
82 82
83To illustrate how you can use these variables to modify your image, 83To illustrate how you can use these variables to modify your image, consider an
84consider an example that selects the SSH server. The Yocto Project ships 84example that selects the SSH server. The Yocto Project ships with two SSH
85with two SSH servers you can use with your images: Dropbear and OpenSSH. 85servers you can use with your images: Dropbear and OpenSSH. Dropbear is a
86Dropbear is a minimal SSH server appropriate for resource-constrained 86minimal SSH server appropriate for resource-constrained environments, while
87environments, while OpenSSH is a well-known standard SSH server 87OpenSSH is a well-known standard SSH server implementation. By default, the
88implementation. By default, the ``core-image-sato`` image is configured 88``core-image-sato`` image is configured to use Dropbear. The
89to use Dropbear. The ``core-image-full-cmdline`` and ``core-image-lsb`` 89``core-image-full-cmdline`` image includes OpenSSH. The ``core-image-minimal``
90images both include OpenSSH. The ``core-image-minimal`` image does not 90image does not contain an SSH server.
91contain an SSH server.
92 91
93You can customize your image and change these defaults. Edit the 92You can customize your image and change these defaults. Edit the
94:term:`IMAGE_FEATURES` variable in your recipe or use the 93:term:`IMAGE_FEATURES` variable in your recipe or use the
diff --git a/documentation/dev-manual/qemu.rst b/documentation/dev-manual/qemu.rst
index f998e47934..bb275a3f74 100644
--- a/documentation/dev-manual/qemu.rst
+++ b/documentation/dev-manual/qemu.rst
@@ -287,12 +287,11 @@ present, the toolchain is also automatically used.
287 networking. 287 networking.
288 288
289 - SSH servers are available in some QEMU images. The ``core-image-sato`` 289 - SSH servers are available in some QEMU images. The ``core-image-sato``
290 QEMU image has a Dropbear secure shell (SSH) server that runs with 290 QEMU image has a Dropbear secure shell (SSH) server that runs with the
291 the root password disabled. The ``core-image-full-cmdline`` and 291 root password disabled. The ``core-image-full-cmdline`` QEMU image has
292 ``core-image-lsb`` QEMU images have OpenSSH instead of Dropbear. 292 OpenSSH instead of Dropbear. Including these SSH servers allow you to use
293 Including these SSH servers allow you to use standard ``ssh`` and 293 standard ``ssh`` and ``scp`` commands. The ``core-image-minimal`` QEMU
294 ``scp`` commands. The ``core-image-minimal`` QEMU image, however, 294 image, however, contains no SSH server.
295 contains no SSH server.
296 295
297 - You can use a provided, user-space NFS server to boot the QEMU 296 - You can use a provided, user-space NFS server to boot the QEMU
298 session using a local copy of the root filesystem on the host. In 297 session using a local copy of the root filesystem on the host. In