diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2014-03-20 08:55:38 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-25 12:29:44 +0000 |
commit | c441f5f005f306a3dfc203237aab42b4a37336b5 (patch) | |
tree | d5b67722674c55f4c170ed35e88773f2bc97693e | |
parent | 7a5cd2123a5665afaa41ed97914650e711ac8682 (diff) | |
download | ast2050-yocto-poky-c441f5f005f306a3dfc203237aab42b4a37336b5.zip ast2050-yocto-poky-c441f5f005f306a3dfc203237aab42b4a37336b5.tar.gz |
dev-manual, ref-manual: Changed core-image-basic to core-image-full-cmdline
Fixes [YOCTO #2424]
Some imgage names were cleaned up to have more meaningful names.
These doc changes here take care of changing "core-image-basic"
to "core-image-full-cmdline".
Five instances changed.
(From yocto-docs rev: b758f9645e66867b5728da1dd989bae70a216fcc)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/dev-manual/dev-manual-common-tasks.xml | 2 | ||||
-rw-r--r-- | documentation/dev-manual/dev-manual-start.xml | 20 | ||||
-rw-r--r-- | documentation/ref-manual/ref-images.xml | 2 | ||||
-rw-r--r-- | documentation/ref-manual/ref-variables.xml | 4 |
4 files changed, 16 insertions, 12 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml index 805bada..ec1e8fc 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/documentation/dev-manual/dev-manual-common-tasks.xml @@ -1017,7 +1017,7 @@ well-known standard SSH server implementation. By default, the <filename>core-image-sato</filename> image is configured to use Dropbear. - The <filename>core-image-basic</filename> and + The <filename>core-image-full-cmdline</filename> and <filename>core-image-lsb</filename> images both include OpenSSH. The <filename>core-image-minimal</filename> image does not diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml index 05cb8fc..deea5a7 100644 --- a/documentation/dev-manual/dev-manual-start.xml +++ b/documentation/dev-manual/dev-manual-start.xml @@ -368,15 +368,19 @@ If so, you can configure the operating system of the running image to use that port to run a console. The connection uses standard IP networking.</para></listitem> - <listitem><para>SSH servers exist in some QEMU images. - The <filename>core-image-sato</filename> QEMU image has a Dropbear secure - shell (SSH) server that runs with the root password disabled. - The <filename>core-image-basic</filename> and <filename>core-image-lsb</filename> QEMU images + <listitem><para> + SSH servers exist in some QEMU images. + The <filename>core-image-sato</filename> QEMU image has a + Dropbear secure shell (SSH) server that runs with the root + password disabled. + The <filename>core-image-full-cmdline</filename> and + <filename>core-image-lsb</filename> QEMU images have OpenSSH instead of Dropbear. - Including these SSH servers allow you to use standard <filename>ssh</filename> and - <filename>scp</filename> commands. - The <filename>core-image-minimal</filename> QEMU image, however, contains no SSH - server.</para></listitem> + Including these SSH servers allow you to use standard + <filename>ssh</filename> and <filename>scp</filename> commands. + The <filename>core-image-minimal</filename> QEMU image, + however, contains no SSH server. + </para></listitem> <listitem><para>You can use a provided, user-space NFS server to boot the QEMU session using a local copy of the root filesystem on the host. In order to make this connection, you must extract a root filesystem tarball by using the diff --git a/documentation/ref-manual/ref-images.xml b/documentation/ref-manual/ref-images.xml index a002c59..529decf 100644 --- a/documentation/ref-manual/ref-images.xml +++ b/documentation/ref-manual/ref-images.xml @@ -71,7 +71,7 @@ for the Minimal MTD Utilities, which let the user interact with the MTD subsystem in the kernel to perform operations on flash devices. </para></listitem> - <listitem><para><emphasis><filename>core-image-basic</filename>:</emphasis> + <listitem><para><emphasis><filename>core-image-full-cmdline</filename>:</emphasis> A console-only image with more full-featured Linux system functionality installed.</para></listitem> <listitem><para><emphasis><filename>core-image-lsb</filename>:</emphasis> diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 5f2b76b..8e4f179 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml @@ -4297,7 +4297,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" <para> This variable affects all images based on <filename>packagegroup-base</filename>, which does not include the - <filename>core-image-minimal</filename> or <filename>core-image-basic</filename> + <filename>core-image-minimal</filename> or <filename>core-image-full-cmdline</filename> images. </para> <para> @@ -4336,7 +4336,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" <para> This variable affects only images based on <filename>packagegroup-base</filename>, which does not include the - <filename>core-image-minimal</filename> or <filename>core-image-basic</filename> + <filename>core-image-minimal</filename> or <filename>core-image-full-cmdline</filename> images. </para> <para> |