r1634 - / trunk/BOOK trunk/BOOK/final-system/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon May 22 02:05:44 PDT 2006


Author: jim
Date: 2006-05-22 03:05:43 -0600 (Mon, 22 May 2006)
New Revision: 1634

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/final-system/common/shadow.xml
Log:
 r3586 at server (orig r1672):  jim | 2006-05-22 01:21:22 -0700
  r3584 at server:  jim | 2006-05-22 01:19:01 -0700
  Fixed a issues with cracklib and shadow builds. Many times reported in IRC and support lists.
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1671
   + b6734a72-470d-0410-b049-f317dca95413:/:1672


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3583
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3584
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/final-system/common/shadow.xml
===================================================================
--- trunk/BOOK/final-system/common/shadow.xml	2006-05-22 09:05:35 UTC (rev 1633)
+++ trunk/BOOK/final-system/common/shadow.xml	2006-05-22 09:05:43 UTC (rev 1634)
@@ -107,17 +107,17 @@
       <primary sortas="e-/etc/login.defs">/etc/login.defs</primary>
     </indexterm>
 
-    <note os="s">
+<screen os="s"><userinput>sed -e's@#MD5_CRYPT_ENAB.no at MD5_CRYPT_ENAB yes@' \
+    -e 's@/var/spool/mail@/var/mail@' \
+    etc/login.defs > /etc/login.defs</userinput></screen>
+
+    <note os="t">
       <para>If you built Shadow with Cracklib support, insert the following into
       the <command>sed</command> given below:</para>
 
-<screen><literal>-e 's at DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@'</literal></screen>
+<screen><literal>sed -i 's at DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' /etc/login.defs</literal></screen>
     </note>
 
-<screen os="t"><userinput>sed -e's@#MD5_CRYPT_ENAB.no at MD5_CRYPT_ENAB yes@' \
-    -e 's@/var/spool/mail@/var/mail@' \
-    etc/login.defs > /etc/login.defs</userinput></screen>
-
     <para os="u">Move a misplaced program to its proper location:</para>
 
 <screen os="v"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>




More information about the cross-lfs mailing list