Drop patching file

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

1 files changed, 29 insertions, 44 deletions

diff --git a/chapter09/theend.xml b/chapter09/theend.xml
index ffcd32b0e..9f2ca17cc 100644
--- a/chapter09/theend.xml
+++ b/chapter09/theend.xml
@@ -18,82 +18,67 @@
     <primary sortas="e-/etc/lsb-release">/etc/lsb-release</primary>
   </indexterm>
 
-  <indexterm zone="ch-finish-theend" revision="systemd">
+  <indexterm zone="ch-finish-theend">
     <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 revision="systemd">Create an <filename>/etc/os-release</filename> 
-        file required by systemd:</para>
-
-<screen arch="default" 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;"
-VERSION_CODENAME="&lt;your name here&gt;"
-EOF</userinput></screen>
-
-<screen arch="ml_32,ml_x32,ml_all" 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; Multlib"
-VERSION_CODENAME="&lt;your name here&gt;"
-EOF</userinput></screen>
-
-  <para revision="sysv">It may be a good idea to create an
+  <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>
 
-<screen arch="default" revision="sysv"><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
-<screen arch="ml_32,ml_x32,ml_all" revision="sysv"><userinput>echo &version;-multilib &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="sysv"><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
 
 <screen revision="systemd"><userinput>echo &versiond; &gt; /etc/lfs-release</userinput></screen>
 
-  <para>It is also a good idea to create a file to show the status of your
+  <para>Two files describing the installed system may be used by packages
+  that will be installed on the system, either in binary form or by building
+  them.</para>
+
+  <para>The first one shows the status of your
   new system with respect to the Linux Standards Base (LSB).  To create
   this file, run:</para>
 
-<screen arch="default" revision="sysv"><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 arch="default" revision="systemd"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
+<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>
 
-<screen arch="ml_32,ml_x32,ml_all" revision="sysv"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
-DISTRIB_ID="Linux From Scratch"
-DISTRIB_RELEASE="&version;-multilib"
-DISTRIB_CODENAME="&lt;your name here&gt;"
-DISTRIB_DESCRIPTION="Linux From Scratch"
+  <para>The second one contains roughly the same information, and is used
+  by systemd and some graphical desktop environments.  To create
+  this file, run:</para>
+
+<screen revision="sysv"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
+NAME="Linux From Scratch"
+VERSION="&version;"
+ID=lfs
+PRETTY_NAME="Linux From Scratch &version;"
+VERSION_CODENAME="&lt;your name here&gt;"
 EOF</userinput></screen>
 
-<screen arch="ml_32,ml_x32,ml_all" revision="systemd"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
-DISTRIB_ID="Linux From Scratch"
-DISTRIB_RELEASE="&versiond;-multilib"
-DISTRIB_CODENAME="&lt;your name here&gt;"
-DISTRIB_DESCRIPTION="Linux From Scratch"
+<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;"
+VERSION_CODENAME="&lt;your name here&gt;"
 EOF</userinput></screen>
 
-  <para>Be sure to put some sort of customization for the field
-  'DISTRIB_CODENAME' to make the system uniquely yours.</para>
+  <para>Be sure to put some sort of customization for the fields
+  'DISTRIB_CODENAME' and 'VERSION_CODENAME' to make the system uniquely
+  yours.</para>
 
 </sect1>