[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-rc1-sysvinit-19-gfc44790

[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  fc44790fc7163afabc5ca89ee7cabde2e3707a13 (commit)
      from  b2fdfa15ab6a1a8d2aa8868f7466d6cc9ea868e5 (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 fc44790fc7163afabc5ca89ee7cabde2e3707a13
Author: Chris Staub <chris at beaker67.com>
Date:   Sat Aug 2 04:28:15 2014 -0400

    Consolidated cracklib notes
    
    Conflicts:
    	BOOK/final-system/common/shadow.xml
    	BOOK/final-system/multilib/shadow.xml

diff --git a/BOOK/final-system/common/shadow.xml b/BOOK/final-system/common/shadow.xml
index dd687cf..0db74dc 100644
--- a/BOOK/final-system/common/shadow.xml
+++ b/BOOK/final-system/common/shadow.xml
@@ -28,9 +28,15 @@
     <note os="a">
       <para>If you would like to enforce the use of strong passwords,
       refer to <ulink url="&cblfs-root;index.php/Cracklib"/>
-      for installing Cracklib prior to building Shadow. Then add
-      <parameter>--with-libcrack</parameter> to the <command>configure</command>
-      command below.</para>
+      for installing Cracklib prior to building Shadow. After Cracklib is
+      installed, execute this <command>sed</command> in Shadow's source
+      directory to correct the path to the Cracklib dictionary:</para>
+
+<screen role="nodump"><userinput>sed -i 's@\(DICTPATH.\).*@\1/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
+
+      <para>Finally, add <parameter>--with-libcrack</parameter> to the
+      <command>configure</command> command below.</para>
+
     </note>
 
     <para os="b">Disable the installation of the <command>groups</command> and
@@ -86,17 +92,9 @@ find man -name Makefile.in -exec sed -i \
     -e 's@#\(ENCRYPT_METHOD \).*@\1SHA512@' \
     -e 's@/var/spool/mail@/var/mail@'</userinput></screen>
 
-    <note os="t">
-      <para>If you built Shadow with Cracklib support, execute
-      this <command>sed</command> to correct the path to the Cracklib
-      dictionary:</para>
-
-<screen role="nodump"><userinput>sed -i 's at DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' /etc/login.defs</userinput></screen>
-    </note>
-
-    <para os="u">Move a misplaced program to its proper location:</para>
+    <para os="t">Move a misplaced program to its proper location:</para>
 
-<screen os="v"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
+<screen os="u"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
 
   </sect2>
 
diff --git a/BOOK/final-system/multilib/shadow.xml b/BOOK/final-system/multilib/shadow.xml
index 2ebe310..157e7f4 100644
--- a/BOOK/final-system/multilib/shadow.xml
+++ b/BOOK/final-system/multilib/shadow.xml
@@ -87,10 +87,6 @@
     href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

Summary of changes:
 BOOK/final-system/common/shadow.xml   |   24 +++++++++++-------------
 BOOK/final-system/multilib/shadow.xml |    4 ----
 2 files changed, 11 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book