Create branches/merge in svn repo fo rtesting of merged LFS books

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11073 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 38 insertions, 8 deletions

diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml
index 7bba9015b..590244d23 100644
--- a/chapter09/reboot.xml
+++ b/chapter09/reboot.xml
@@ -73,8 +73,8 @@
         <listitem><para>/etc/vimrc                   </para></listitem>
         <listitem><para>/root/.bash_profile          </para></listitem>
         <listitem><para>/root/.bashrc                </para></listitem>
-        <listitem><para>/etc/sysconfig/network       </para></listitem>
-        <listitem><para>/etc/sysconfig/ifconfig.eth0 </para></listitem>
+        <listitem revision="sysv"><para>/etc/sysconfig/network       </para></listitem>
+        <listitem revision="sysv"><para>/etc/sysconfig/ifconfig.eth0 </para></listitem>
       </itemizedlist>
     </listitem>
   </itemizedlist>
diff --git a/chapter09/theend.xml b/chapter09/theend.xml
index e7d9f3068..2d29242b0 100644
--- a/chapter09/theend.xml
+++ b/chapter09/theend.xml
@@ -18,27 +18,57 @@
     <primary sortas="e-/etc/lsb-release">/etc/lsb-release</primary>
   </indexterm>
 
+  <indexterm zone="ch-finish-theend" revision="systemd">
+    <primary sortas="e-/etc/os-release">/etc/os-release</primary>
+  </indexterm>
+
   <para>Well done! The new LFS system is installed! We wish you much
   success with your shiny new custom-built Linux system.</para>
 
-  <para>It may be a good idea to create an <filename>/etc/lfs-release</filename>
-  file. By having this file, it is very easy for you (and for us if you need to
-  ask for help at some point) to find out which LFS version is installed on the
-  system. Create this file by running:</para>
+  <para revision="systemd">Create an <filename>/etc/os-release</filename> 
+        file required by systemd:</para>
+
+<screen revision="systemd"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
+NAME="Linux From Scratch"
+VERSION="&versiond;"
+ID=lfs
+PRETTY_NAME="Linux From Scratch &versiond;"
+EOF</userinput></screen>
+
+  <para revision="sysv">It may be a good idea to create an
+  <filename>/etc/lfs-release</filename> file. By having this file, it is very
+  easy for you (and for us if you need to ask for help at some point) to find
+  out which LFS version is installed on the system. Create this file by
+  running:</para>
+
+<screen revision="sysv"><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
 
-<screen><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
+  <para revision="systemd">Creating the file
+  <filename>/etc/lfs-release</filename> is recommended for compatibility with
+  the non-systemd branch. By having this file, it is very easy for you (and for
+  us if you need to ask for help at some point) to find out which LFS version
+  is installed on the system. Create this file by running:</para>
+
+<screen revision="systemd"><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
 
   <para>It is also a good idea to create a file to show the status of your
   new system with respect to the Linux Standards Base (LSB).  To create
   this file, run:</para>
 
-<screen><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
+<screen revision="sysv"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
 DISTRIB_ID="Linux From Scratch"
 DISTRIB_RELEASE="&version;"
 DISTRIB_CODENAME="&lt;your name here&gt;"
 DISTRIB_DESCRIPTION="Linux From Scratch"
 EOF</userinput></screen>
 
+<screen revision="systemd"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
+DISTRIB_ID="Linux From Scratch"
+DISTRIB_RELEASE="&versiond;"
+DISTRIB_CODENAME="&lt;your name here&gt;"
+DISTRIB_DESCRIPTION="Linux From Scratch"
+EOF</userinput></screen>
+
   <para>Be sure to put some sort of customization for the field
   'DISTRIB_CODENAME' to make the system uniquely yours.</para>