summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2014-04-02 13:24:14 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-04 15:20:17 +0100
commit5d6dcdb837e4369b4b624e9ff6fcf432c44c2c29 (patch)
tree8039a411f0264d5d63c90be6bbddf1846c019f66 /documentation
parent6ff92a69662a23794732113be7f761b8d5fb9a65 (diff)
downloadpoky-5d6dcdb837e4369b4b624e9ff6fcf432c44c2c29.tar.gz
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>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml24
-rw-r--r--documentation/ref-manual/ref-classes.xml8
-rw-r--r--documentation/ref-manual/ref-variables.xml24
3 files changed, 55 insertions, 1 deletions
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 @@
2096 See the <filename>systemd.class</filename> file 2096 See the <filename>systemd.class</filename> file
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.</para></listitem> 2099 section for more information.
2100 <note>For Systemd-based images, include the following
2101 in your <filename>local.conf</filename> file:
2102 <literallayout class='monospaced'>
2103 VIRTUAL-RUNTIME_initscripts = ""
2104 </literallayout>
2105 </note></para></listitem>
2100 </itemizedlist> 2106 </itemizedlist>
2101 </para> 2107 </para>
2102 </section> 2108 </section>
@@ -5356,6 +5362,14 @@
5356 <title>Using Systemd Exclusively</title> 5362 <title>Using Systemd Exclusively</title>
5357 5363
5358 <para> 5364 <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>
5359 Set the these variables in your distribution configuration 5373 Set the these variables in your distribution configuration
5360 file as follows: 5374 file as follows:
5361 <literallayout class='monospaced'> 5375 <literallayout class='monospaced'>
@@ -5381,6 +5395,14 @@
5381 <title>Using Systemd for the Main Image and Using SysVinit for the Rescue Image</title> 5395 <title>Using Systemd for the Main Image and Using SysVinit for the Rescue Image</title>
5382 5396
5383 <para> 5397 <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>
5384 Set the these variables in your distribution configuration 5406 Set the these variables in your distribution configuration
5385 file as follows: 5407 file as follows:
5386 <literallayout class='monospaced'> 5408 <literallayout class='monospaced'>
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 @@
2854 to "disable". 2854 to "disable".
2855 </para> 2855 </para>
2856 2856
2857 <note>
2858 For Systemd-based images, include the following
2859 in your <filename>local.conf</filename> file:
2860 <literallayout class='monospaced'>
2861 VIRTUAL-RUNTIME_initscripts = ""
2862 </literallayout>
2863 </note>
2864
2857 <para> 2865 <para>
2858 For more information on <filename>systemd</filename>, see the 2866 For more information on <filename>systemd</filename>, see the
2859 "<ulink url='&YOCTO_DOCS_DEV_URL;#selecting-an-initialization-manager'>Selecting an Initialization Manager</ulink>" 2867 "<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"
7113 You can disable the service by setting the variable to 7113 You can disable the service by setting the variable to
7114 "disable." 7114 "disable."
7115 </para> 7115 </para>
7116
7117 <note>
7118 For Systemd-based images, include the following
7119 in your <filename>local.conf</filename> file:
7120 <literallayout class='monospaced'>
7121 VIRTUAL-RUNTIME_initscripts = ""
7122 </literallayout>
7123 </note>
7116 </glossdef> 7124 </glossdef>
7117 </glossentry> 7125 </glossentry>
7118 7126
@@ -7136,6 +7144,14 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
7136 or packages in which the build system can find the systemd 7144 or packages in which the build system can find the systemd
7137 unit files. 7145 unit files.
7138 </para> 7146 </para>
7147
7148 <note>
7149 For Systemd-based images, include the following
7150 in your <filename>local.conf</filename> file:
7151 <literallayout class='monospaced'>
7152 VIRTUAL-RUNTIME_initscripts = ""
7153 </literallayout>
7154 </note>
7139 </glossdef> 7155 </glossdef>
7140 </glossentry> 7156 </glossentry>
7141 7157
@@ -7157,6 +7173,14 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
7157 SYSTEMD_SERVICE_${PN} = "connman.service" 7173 SYSTEMD_SERVICE_${PN} = "connman.service"
7158 </literallayout> 7174 </literallayout>
7159 </para> 7175 </para>
7176
7177 <note>
7178 For Systemd-based images, include the following
7179 in your <filename>local.conf</filename> file:
7180 <literallayout class='monospaced'>
7181 VIRTUAL-RUNTIME_initscripts = ""
7182 </literallayout>
7183 </note>
7160 </glossdef> 7184 </glossdef>
7161 </glossentry> 7185 </glossentry>
7162 7186