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 6348259446..6eed9ef56a 100644
--- a/documentation/dev-manual/customizing-images.rst
+++ b/documentation/dev-manual/customizing-images.rst
@@ -79,15 +79,14 @@ recipe that are enabled with :term:`IMAGE_FEATURES`. The value of
79:term:`EXTRA_IMAGE_FEATURES` is added to :term:`IMAGE_FEATURES` within 79:term:`EXTRA_IMAGE_FEATURES` is added to :term:`IMAGE_FEATURES` within
80``meta/conf/bitbake.conf``. 80``meta/conf/bitbake.conf``.
81 81
82To illustrate how you can use these variables to modify your image, 82To illustrate how you can use these variables to modify your image, consider an
83consider an example that selects the SSH server. The Yocto Project ships 83example that selects the SSH server. The Yocto Project ships with two SSH
84with two SSH servers you can use with your images: Dropbear and OpenSSH. 84servers you can use with your images: Dropbear and OpenSSH. Dropbear is a
85Dropbear is a minimal SSH server appropriate for resource-constrained 85minimal SSH server appropriate for resource-constrained environments, while
86environments, while OpenSSH is a well-known standard SSH server 86OpenSSH is a well-known standard SSH server implementation. By default, the
87implementation. By default, the ``core-image-sato`` image is configured 87``core-image-sato`` image is configured to use Dropbear. The
88to use Dropbear. The ``core-image-full-cmdline`` and ``core-image-lsb`` 88``core-image-full-cmdline`` image includes OpenSSH. The ``core-image-minimal``
89images both include OpenSSH. The ``core-image-minimal`` image does not 89image does not contain an SSH server.
90contain an SSH server.
91 90
92You can customize your image and change these defaults. Edit the 91You can customize your image and change these defaults. Edit the
93:term:`IMAGE_FEATURES` variable in your recipe or use the 92: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 19f3e40d63..9014d75f4d 100644
--- a/documentation/dev-manual/qemu.rst
+++ b/documentation/dev-manual/qemu.rst
@@ -280,12 +280,11 @@ present, the toolchain is also automatically used.
280 networking. 280 networking.
281 281
282 - SSH servers are available in some QEMU images. The ``core-image-sato`` 282 - SSH servers are available in some QEMU images. The ``core-image-sato``
283 QEMU image has a Dropbear secure shell (SSH) server that runs with 283 QEMU image has a Dropbear secure shell (SSH) server that runs with the
284 the root password disabled. The ``core-image-full-cmdline`` and 284 root password disabled. The ``core-image-full-cmdline`` QEMU image has
285 ``core-image-lsb`` QEMU images have OpenSSH instead of Dropbear. 285 OpenSSH instead of Dropbear. Including these SSH servers allow you to use
286 Including these SSH servers allow you to use standard ``ssh`` and 286 standard ``ssh`` and ``scp`` commands. The ``core-image-minimal`` QEMU
287 ``scp`` commands. The ``core-image-minimal`` QEMU image, however, 287 image, however, contains no SSH server.
288 contains no SSH server.
289 288
290 - You can use a provided, user-space NFS server to boot the QEMU 289 - You can use a provided, user-space NFS server to boot the QEMU
291 session using a local copy of the root filesystem on the host. In 290 session using a local copy of the root filesystem on the host. In