From 5d6dcdb837e4369b4b624e9ff6fcf432c44c2c29 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Wed, 2 Apr 2014 13:24:14 -0600
Subject: [PATCH] dev-manual, ref-manual: Added notes for Systemd-based images.

Fixes [YOCTO #5159]

In the dev-manual, I located instances where a note about using
VIRTURAL-RUNTIME_initscripts = "" in the local.conf file would
be appropriate.  Three areas updated.

In the ref-manual, I located the note in the systemd.bbclass
section and the variable descriptions for SYSTEM_AUTO_ENABLE,
SYSTEM_PACKAGES, and SYSTEMD_SERVICE.

(From yocto-docs rev: 57b0acf2f3f8159b635b42dcffa129f7d945eb81)

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    | 24 ++++++++++++++++++-
 documentation/ref-manual/ref-classes.xml      |  8 +++++++
 documentation/ref-manual/ref-variables.xml    | 24 +++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index c6e4efd6d9..b8be01b012 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -2096,7 +2096,13 @@
                         See the <filename>systemd.class</filename> file
                         located in your
                         <link linkend='source-directory'>Source Directory</link>.
-                        section for more information.</para></listitem>
+                        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>
                 </itemizedlist>
             </para>
         </section>
@@ -5355,6 +5361,14 @@
         <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:
@@ -5380,6 +5394,14 @@
         <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 55ee43ce87..c86875ed84 100644
--- a/documentation/ref-manual/ref-classes.xml
+++ b/documentation/ref-manual/ref-classes.xml
@@ -2854,6 +2854,14 @@
         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 22d7f13a0a..d42929a016 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -7113,6 +7113,14 @@ 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>
 
@@ -7136,6 +7144,14 @@ 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>
 
@@ -7157,6 +7173,14 @@ 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>