From 2ebc0d98fea24fe66291bdcf6bdc2cf11e4fece9 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 4 Mar 2013 23:01:15 +0000
Subject: [PATCH] /etc/localtime needs to be a symlink for timedatectl to work

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10195 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml    |  5 +++++
 chapter06/glibc.xml        | 19 +------------------
 chapter07/introduction.xml |  5 +----
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index fec47e18c..c7b2fff48 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
     <listitem>
       <para>2013-03-04</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Make the <filename>/etc/localtime</filename> file a
+          symlink again, so that <command>timedatectl</command> displays the
+          timezone correctly.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Document how to configure the virtual console under
           Systemd.</para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 503c0159d..eae2da683 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -346,28 +346,11 @@ unset ZONEINFO</userinput></screen>
     <para>Then create the <filename>/etc/localtime</filename> file by
     running:</para>
 
-<screen><userinput>cp -v --remove-destination /usr/share/zoneinfo/<replaceable>&lt;xxx&gt;</replaceable> \
-    /etc/localtime</userinput></screen>
+<screen><userinput>ln -s /etc/localtime /usr/share/zoneinfo/<replaceable>&lt;xxx&gt;</replaceable></userinput></screen>
 
     <para>Replace <replaceable>&lt;xxx&gt;</replaceable> with the name of the
     time zone selected (e.g., Canada/Eastern).</para>
 
-    <variablelist>
-      <title>The meaning of the cp option:</title>
-
-      <varlistentry>
-        <term><parameter>--remove-destination</parameter></term>
-        <listitem>
-          <para>This is needed to force removal of the already existing symbolic
-          link. The reason for copying the file instead of using a symlink is to
-          cover the situation where <filename class="directory">/usr</filename>
-          is on a separate partition. This could be important when booted into
-          single user mode.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
   </sect2>
 
   <sect2 id="conf-ld" role="configuration">
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
index c2aa3fe94..d9a58f875 100644
--- a/chapter07/introduction.xml
+++ b/chapter07/introduction.xml
@@ -34,15 +34,12 @@
      </listitem>
   </itemizedlist>
 
-  <para>Third, configuring hostname, keyboard layout and system clock.</para>
+  <para>Third, configuring the hostname, and keyboard layout.</para>
 
   <itemizedlist>
      <listitem>
        <para><xref linkend="ch-scripts-hostname" role="."/></para>
      </listitem>
-     <listitem>
-       <para><xref linkend="ch-scripts-setclock" role="."/></para>
-     </listitem>
      <listitem>
        <para><xref linkend="ch-scripts-console" role="."/></para>
      </listitem>