Add /etc/os-release to SysV,

and reword instructions in "The End"

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11721 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

3 files changed, 43 insertions, 25 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b6faebaf8..cc2aec265 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,16 @@
     appropriate for the entry or if needed the entire day's listitem.
        -->
     <listitem>
+      <para>2020-01-09</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Add <filename>/etc/os-release</filename> to
+          the sysV version, as it is required by some packages in BLFS.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2020-01-06</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter09/theend.xml b/chapter09/theend.xml
index 0df3de5a5..9f2ca17cc 100644
--- a/chapter09/theend.xml
+++ b/chapter09/theend.xml
@@ -18,25 +18,14 @@
     <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 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 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
@@ -44,15 +33,13 @@ EOF</userinput></screen>
 
 <screen revision="sysv"><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 &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>
 
@@ -70,7 +57,28 @@ 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>
+  <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 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 fields
+  'DISTRIB_CODENAME' and 'VERSION_CODENAME' to make the system uniquely
+  yours.</para>
 
 </sect1>
diff --git a/general.ent b/general.ent
index 816774d33..233da37ab 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20200106">
+<!ENTITY version         "SVN-20200109">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20200106-systemd">
+<!ENTITY versiond        "20200109-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "January 6th, 2020">
+<!ENTITY releasedate     "January 9th, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "9.0">