diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2014-04-14 07:35:03 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-19 16:25:01 +0100 |
commit | ce9fb83aa91b76f3d8347884bd3c9d20622cbb2b (patch) | |
tree | e827c3da5e2128f95cc195fec39c65e07f1abb51 | |
parent | 0c4d56c86feeeb5d5ecd2f663e1df4ea36b2c8cf (diff) | |
download | poky-ce9fb83aa91b76f3d8347884bd3c9d20622cbb2b.tar.gz |
dev-manual, ref-manual: Removed VIRTUAL-RUNTIME note from most places.
Fixes [YOCTO #5159]
Edits to fix the occurrences of VIRTUAL-RUNTIME_initscripts = "".
I removed it from all places in the manuals except under
"Selecting an Initialization Manager". Note that it still
needed removed from "Using Systemd for the Main Image and
Using SysVinit for the Rescue Image".
Also, in the "Using Systemd Exclusively" section I made some
edits as suggested by Paul Eggleton's review.
(From yocto-docs rev: 28b2e3eba3acff17f165899a7f4a65c98263e201)
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 | 31 | ||||
-rw-r--r-- | documentation/ref-manual/ref-classes.xml | 8 | ||||
-rw-r--r-- | documentation/ref-manual/ref-variables.xml | 24 |
3 files changed, 9 insertions, 54 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml index 611b407429..767b72a18f 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/documentation/dev-manual/dev-manual-common-tasks.xml | |||
@@ -2097,12 +2097,7 @@ | |||
2097 | located in your | 2097 | located in your |
2098 | <link linkend='source-directory'>Source Directory</link>. | 2098 | <link linkend='source-directory'>Source Directory</link>. |
2099 | section for more information. | 2099 | section for more information. |
2100 | <note>For Systemd-based images, include the following | 2100 | </para></listitem> |
2101 | in your <filename>local.conf</filename> file: | ||
2102 | <literallayout class='monospaced'> | ||
2103 | VIRTUAL-RUNTIME_initscripts = "" | ||
2104 | </literallayout> | ||
2105 | </note></para></listitem> | ||
2106 | </itemizedlist> | 2101 | </itemizedlist> |
2107 | </para> | 2102 | </para> |
2108 | </section> | 2103 | </section> |
@@ -5362,14 +5357,6 @@ | |||
5362 | <title>Using Systemd Exclusively</title> | 5357 | <title>Using Systemd Exclusively</title> |
5363 | 5358 | ||
5364 | <para> | 5359 | <para> |
5365 | Set this variable in your <filename>local.conf</filename> | ||
5366 | file: | ||
5367 | <literallayout class='monospaced'> | ||
5368 | VIRTUAL-RUNTIME_initscripts = "" | ||
5369 | </literallayout> | ||
5370 | </para> | ||
5371 | |||
5372 | <para> | ||
5373 | Set the these variables in your distribution configuration | 5360 | Set the these variables in your distribution configuration |
5374 | file as follows: | 5361 | file as follows: |
5375 | <literallayout class='monospaced'> | 5362 | <literallayout class='monospaced'> |
@@ -5386,6 +5373,14 @@ | |||
5386 | </para> | 5373 | </para> |
5387 | 5374 | ||
5388 | <para> | 5375 | <para> |
5376 | To remove initscripts from your image altogether, | ||
5377 | set this variable also: | ||
5378 | <literallayout class='monospaced'> | ||
5379 | VIRTUAL-RUNTIME_initscripts = "" | ||
5380 | </literallayout> | ||
5381 | </para> | ||
5382 | |||
5383 | <para> | ||
5389 | For information on the backfill variable, see | 5384 | For information on the backfill variable, see |
5390 | <ulink url='&YOCTO_DOCS_REF_URL;#var-DISTRO_FEATURES_BACKFILL_CONSIDERED'><filename>DISTRO_FEATURES_BACKFILL_CONSIDERED</filename></ulink>. | 5385 | <ulink url='&YOCTO_DOCS_REF_URL;#var-DISTRO_FEATURES_BACKFILL_CONSIDERED'><filename>DISTRO_FEATURES_BACKFILL_CONSIDERED</filename></ulink>. |
5391 | </para> | 5386 | </para> |
@@ -5395,14 +5390,6 @@ | |||
5395 | <title>Using Systemd for the Main Image and Using SysVinit for the Rescue Image</title> | 5390 | <title>Using Systemd for the Main Image and Using SysVinit for the Rescue Image</title> |
5396 | 5391 | ||
5397 | <para> | 5392 | <para> |
5398 | Set this variable in your <filename>local.conf</filename> | ||
5399 | file: | ||
5400 | <literallayout class='monospaced'> | ||
5401 | VIRTUAL-RUNTIME_initscripts = "" | ||
5402 | </literallayout> | ||
5403 | </para> | ||
5404 | |||
5405 | <para> | ||
5406 | Set the these variables in your distribution configuration | 5393 | Set the these variables in your distribution configuration |
5407 | file as follows: | 5394 | file as follows: |
5408 | <literallayout class='monospaced'> | 5395 | <literallayout class='monospaced'> |
diff --git a/documentation/ref-manual/ref-classes.xml b/documentation/ref-manual/ref-classes.xml index 22a0bce218..964193f9e2 100644 --- a/documentation/ref-manual/ref-classes.xml +++ b/documentation/ref-manual/ref-classes.xml | |||
@@ -2896,14 +2896,6 @@ | |||
2896 | to "disable". | 2896 | to "disable". |
2897 | </para> | 2897 | </para> |
2898 | 2898 | ||
2899 | <note> | ||
2900 | For Systemd-based images, include the following | ||
2901 | in your <filename>local.conf</filename> file: | ||
2902 | <literallayout class='monospaced'> | ||
2903 | VIRTUAL-RUNTIME_initscripts = "" | ||
2904 | </literallayout> | ||
2905 | </note> | ||
2906 | |||
2907 | <para> | 2899 | <para> |
2908 | For more information on <filename>systemd</filename>, see the | 2900 | For more information on <filename>systemd</filename>, see the |
2909 | "<ulink url='&YOCTO_DOCS_DEV_URL;#selecting-an-initialization-manager'>Selecting an Initialization Manager</ulink>" | 2901 | "<ulink url='&YOCTO_DOCS_DEV_URL;#selecting-an-initialization-manager'>Selecting an Initialization Manager</ulink>" |
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index fbf0a43dee..b3febc8c85 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml | |||
@@ -7364,14 +7364,6 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
7364 | You can disable the service by setting the variable to | 7364 | You can disable the service by setting the variable to |
7365 | "disable." | 7365 | "disable." |
7366 | </para> | 7366 | </para> |
7367 | |||
7368 | <note> | ||
7369 | For Systemd-based images, include the following | ||
7370 | in your <filename>local.conf</filename> file: | ||
7371 | <literallayout class='monospaced'> | ||
7372 | VIRTUAL-RUNTIME_initscripts = "" | ||
7373 | </literallayout> | ||
7374 | </note> | ||
7375 | </glossdef> | 7367 | </glossdef> |
7376 | </glossentry> | 7368 | </glossentry> |
7377 | 7369 | ||
@@ -7395,14 +7387,6 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
7395 | or packages in which the build system can find the systemd | 7387 | or packages in which the build system can find the systemd |
7396 | unit files. | 7388 | unit files. |
7397 | </para> | 7389 | </para> |
7398 | |||
7399 | <note> | ||
7400 | For Systemd-based images, include the following | ||
7401 | in your <filename>local.conf</filename> file: | ||
7402 | <literallayout class='monospaced'> | ||
7403 | VIRTUAL-RUNTIME_initscripts = "" | ||
7404 | </literallayout> | ||
7405 | </note> | ||
7406 | </glossdef> | 7390 | </glossdef> |
7407 | </glossentry> | 7391 | </glossentry> |
7408 | 7392 | ||
@@ -7424,14 +7408,6 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
7424 | SYSTEMD_SERVICE_${PN} = "connman.service" | 7408 | SYSTEMD_SERVICE_${PN} = "connman.service" |
7425 | </literallayout> | 7409 | </literallayout> |
7426 | </para> | 7410 | </para> |
7427 | |||
7428 | <note> | ||
7429 | For Systemd-based images, include the following | ||
7430 | in your <filename>local.conf</filename> file: | ||
7431 | <literallayout class='monospaced'> | ||
7432 | VIRTUAL-RUNTIME_initscripts = "" | ||
7433 | </literallayout> | ||
7434 | </note> | ||
7435 | </glossdef> | 7411 | </glossdef> |
7436 | </glossentry> | 7412 | </glossentry> |
7437 | 7413 | ||