From ce9fb83aa91b76f3d8347884bd3c9d20622cbb2b Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Mon, 14 Apr 2014 07:35:03 -0700
Subject: 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>
---
 .../dev-manual/dev-manual-common-tasks.xml         | 31 +++++++---------------
 documentation/ref-manual/ref-classes.xml           |  8 ------
 documentation/ref-manual/ref-variables.xml         | 24 -----------------
 3 files changed, 9 insertions(+), 54 deletions(-)

(limited to 'documentation')

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 @@
                         located in your
                         <link linkend='source-directory'>Source Directory</link>.
                         section for more information.
-                        <note>For Systemd-based images, include the following
-                        in your <filename>local.conf</filename> file:
-                        <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                        </literallayout>
-                        </note></para></listitem>
+                        </para></listitem>
                 </itemizedlist>
             </para>
         </section>
@@ -5361,14 +5356,6 @@
         <section id='using-systemd-exclusively'>
             <title>Using Systemd Exclusively</title>
 
-            <para>
-                Set this variable in your <filename>local.conf</filename>
-                file:
-                <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                </literallayout>
-            </para>
-
             <para>
                 Set the these variables in your distribution configuration
                 file as follows:
@@ -5385,6 +5372,14 @@
                 Doing so removes any redundant SysVinit scripts.
             </para>
 
+            <para>
+                To remove  initscripts from your image altogether,
+                set this variable also:
+                <literallayout class='monospaced'>
+     VIRTUAL-RUNTIME_initscripts = ""
+                </literallayout>
+            </para>
+
             <para>
                 For information on the backfill variable, see
                 <ulink url='&YOCTO_DOCS_REF_URL;#var-DISTRO_FEATURES_BACKFILL_CONSIDERED'><filename>DISTRO_FEATURES_BACKFILL_CONSIDERED</filename></ulink>.
@@ -5394,14 +5389,6 @@
         <section id='using-systemd-for-the-main-image-and-using-sysvinit-for-the-rescue-image'>
             <title>Using Systemd for the Main Image and Using SysVinit for the Rescue Image</title>
 
-            <para>
-                Set this variable in your <filename>local.conf</filename>
-                file:
-                <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                </literallayout>
-            </para>
-
             <para>
                 Set the these variables in your distribution configuration
                 file as follows:
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 @@
         to "disable".
     </para>
 
-    <note>
-        For Systemd-based images, include the following
-        in your <filename>local.conf</filename> file:
-        <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-        </literallayout>
-    </note>
-
     <para>
         For more information on <filename>systemd</filename>, see the
         "<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"
                     You can disable the service by setting the variable to
                     "disable."
                 </para>
-
-                <note>
-                    For Systemd-based images, include the following
-                    in your <filename>local.conf</filename> file:
-                    <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                    </literallayout>
-                </note>
             </glossdef>
         </glossentry>
 
@@ -7395,14 +7387,6 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     or packages in which the build system can find the systemd
                     unit files.
                 </para>
-
-                <note>
-                    For Systemd-based images, include the following
-                    in your <filename>local.conf</filename> file:
-                    <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                    </literallayout>
-                </note>
             </glossdef>
         </glossentry>
 
@@ -7424,14 +7408,6 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
      SYSTEMD_SERVICE_${PN} = "connman.service"
                     </literallayout>
                 </para>
-
-                <note>
-                    For Systemd-based images, include the following
-                    in your <filename>local.conf</filename> file:
-                    <literallayout class='monospaced'>
-     VIRTUAL-RUNTIME_initscripts = ""
-                    </literallayout>
-                </note>
             </glossdef>
         </glossentry>
 
-- 
cgit v1.2.3-54-g00ecf