From a728d169764c53a7988fdd4116600f09be53bf52 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 16 Apr 2007 19:38:10 +0000
Subject: [PATCH] Change all references to /etc/adjtime in the Util-Linux
 sources to /var/lib/hwclock/adjtime.  Fixes #1984.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8065 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml  | 8 ++++++++
 chapter06/util-linux.xml | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 85cab8e4b..639cbc509 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,14 @@
     <listitem>
       <para>2007-04-16</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Change all references to
+          <filename>/etc/adjtime</filename> in the Util-Linux sources to
+          <filename>/var/lib/hwclock/adjtime</filename>.  Previously, only
+          <filename>hwclock/hwclock.c</filename> was changed, which meant that
+          man pages contained references to the non-FHS compliant location.
+          Fixes <ulink url="&lfs-ticket-root;1984">#1984</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Udev-108. Fixes
           <ulink url="&lfs-ticket-root;1976">#1976</ulink>.</para>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 2286e302b..49b8d118b 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -43,8 +43,8 @@
     <command>hwclock</command> program FHS-compliant, run the
     following:</para>
 
-<screen><userinput>sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
-    hwclock/hwclock.c
+<screen><userinput>sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
+    -i $(grep -rl '/etc/adjtime' .)
 mkdir -pv /var/lib/hwclock</userinput></screen>
 
   </sect2>