Author: dj
Date: 2008-06-26 23:29:51 -0600 (Thu, 26 Jun 2008)
New Revision: 7496
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/postlfs/security/shadow.xml
Log:
Merge r7495 from 6.3 branch.
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2008-06-27 05:27:03 UTC (rev 7495)
+++ trunk/BOOK/general.ent 2008-06-27 05:29:51 UTC (rev 7496)
@@ -3,7 +3,7 @@
$Date$
-->
-<!ENTITY day "25"> <!-- Always 2 digits -->
+<!ENTITY day "27"> <!-- Always 2 digits -->
<!ENTITY month "06"> <!-- Always 2 digits -->
<!ENTITY year "2008">
<!ENTITY copyrightdate "2001-&year;">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2008-06-27 05:27:03 UTC
(rev 7495)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2008-06-27 05:29:51 UTC
(rev 7496)
@@ -41,6 +41,17 @@
-->
<listitem>
+ <para>June 27th, 2008</para>
+ <itemizedlist>
+ <listitem>
+ <para>[dj] - Merged 6.3 branch changes from r7495 - Corrected warning
+ in shadow instructions to add the --without-pam switch instead of
+ replace.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>June 25th, 2008</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/postlfs/security/shadow.xml
===================================================================
--- trunk/BOOK/postlfs/security/shadow.xml 2008-06-27 05:27:03 UTC (rev
7495)
+++ trunk/BOOK/postlfs/security/shadow.xml 2008-06-27 05:29:51 UTC (rev
7496)
@@ -488,10 +488,10 @@
suite from the <application>Linux-PAM</application> package to assist
you in determining the problem. If you cannot find and
fix the error, you should recompile <application>Shadow</application>
- replacing <option>--with-libpam</option> with
- <option>--without-libpam</option> in the above instructions (also
move
- the <filename>/etc/login.defs.orig</filename> backup file to
- <filename>/etc/login.defs</filename>). If you
+ adding the <option>--without-libpam</option> switch to the
+ <command>configure</command> command in the above instructions
+ (also move the <filename>/etc/login.defs.orig</filename> backup
+ file to <filename>/etc/login.defs</filename>). If you
fail to do this and the errors remain, you will be unable to log into
your system.</para>
</warning>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
