[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-2.1.0-1039-g1ab9a96

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, sysvinit has been updated
       via  1ab9a96d9f6788c8f0c322432a36d46a5e4aceb5 (commit)
       via  b4badbd608262976dbd7447adf2d64825121f6ab (commit)
       via  b4a93252a44e829abe7cc707f8d9746e558df70a (commit)
       via  58ff30e3056b26f3e433dddabb7eb274c5ac033a (commit)
      from  156c0fe11221e1a49c60a83e4b67cb339bcb348e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1ab9a96d9f6788c8f0c322432a36d46a5e4aceb5
Merge: b4badbd 156c0fe
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Sat May 17 10:41:51 2014 -0500

    Fix conflicts with merge.

diff --cc BOOK/introduction/common/changelog.xml
index a85fcbc,fd3796f..d377fe9
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@@ -40,9 -40,9 +40,14 @@@
        <para>17 May 2014</para>
        <itemizedlist>
          <listitem>
 +          <para>[William Harrington] - Move <command>logger</command> to
 +          <filename class="directory">/bin</filename> for CLFS-Bootscripts
++        </listitem>
++        <listitem>
 +          requirement..</para>
+           <para>[Chris] - Changed "systemd" reference on Kbd page to
+           CLFS Bootscripts, and added dumpkeys and kbd_mode to list of
+           programs moved to /bin as they're used in the bootscripts.</para>
          </listitem>
        </itemizedlist>
      </listitem>

commit b4badbd608262976dbd7447adf2d64825121f6ab
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Sat May 17 10:39:43 2014 -0500

    Move /usr/bin/logger to /bin/logger to satsify clfs bootscripts requirement. We used to have this in the book, but it disappeared.

diff --git a/BOOK/final-system/common/util-linux.xml b/BOOK/final-system/common/util-linux.xml
index 09f78c6..eee7f6c 100644
--- a/BOOK/final-system/common/util-linux.xml
+++ b/BOOK/final-system/common/util-linux.xml
@@ -78,6 +78,12 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
 
 <screen os="h"><userinput>make install</userinput></screen>
 
+    <para os="i">Move the <command>logger</command> binary to
+    <filename class="directory">/bin</filename> as it is needed by the
+    CLFS Bootscripts package:</para>
+
+<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-util-linux" role="content">
diff --git a/BOOK/final-system/multilib/util-linux-64bit.xml b/BOOK/final-system/multilib/util-linux-64bit.xml
index c94188e..1934dfc 100644
--- a/BOOK/final-system/multilib/util-linux-64bit.xml
+++ b/BOOK/final-system/multilib/util-linux-64bit.xml
@@ -64,6 +64,14 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

commit b4a93252a44e829abe7cc707f8d9746e558df70a
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Sat May 17 10:39:03 2014 -0500

    Add master change log entry for util-linux logger move.

diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 1fc551a..a85fcbc 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -35,6 +35,18 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>17 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Move <command>logger</command> to
+          <filename class="directory">/bin</filename> for CLFS-Bootscripts
+          requirement..</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>14 May 2014</para>
       <itemizedlist>

commit 58ff30e3056b26f3e433dddabb7eb274c5ac033a
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Sat May 17 10:38:09 2014 -0500

    Update date for May 17,2014.

diff --git a/BOOK/general.ent b/BOOK/general.ent
index 61c8ed1..305d016 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
 
 <!ENTITY month "05"> <!-- Use two digits -->
 <!ENTITY month_name "May">
-<!ENTITY day "16"> <!-- Use two digits -->
+<!ENTITY day "17"> <!-- Use two digits -->
 <!ENTITY year "2014"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/util-linux.xml         |    6 ++++++
 BOOK/final-system/multilib/util-linux-64bit.xml |    8 ++++++++
 BOOK/introduction/common/changelog.xml          |    5 +++++
 3 files changed, 19 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book