Converted shadow.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2379 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 57 insertions, 17 deletions

diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index c3d4f362f..4fbd05c89 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Shadow Password Suite</title>
 
@@ -7,27 +9,66 @@ regarding passwords, such as how to enable the more secure MD5 passwords
 and how to get the most out of this Shadow package. The Shadow hint can
 be found at <ulink url="&hints-root;shadowpasswd_plus.txt"/>.</para>
 
-<para>Install the Shadow Password Suite by running the 
-following commands:</para>
+<para>Prepare Shadow to be compiled:</para>
 
 <para><screen><userinput>./configure --prefix=/usr \
-&nbsp;&nbsp;&nbsp;&nbsp;--libdir=/usr/lib --enable-shared &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-cp etc/{limits,login.access} /etc &amp;&amp;
-sed 's%/var/spool/mail%/var/mail%' \
-&nbsp;&nbsp;&nbsp;&nbsp;etc/login.defs.linux &gt; /etc/login.defs &amp;&amp;
-ln -s vipw /usr/sbin/vigr &amp;&amp;
-rm /bin/vipw &amp;&amp;
-mv /bin/sg /usr/bin &amp;&amp;
-mv /usr/lib/lib{shadow,misc}.so.0* /lib &amp;&amp;
-ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;--libdir=/usr/lib --enable-shared</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Install the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>Shadow uses two files to configure authentication settings for
+the system. Install those config files:</para>
+
+<para><screen><userinput>cp etc/{limits,login.access} /etc</userinput></screen></para>
+
+<para><filename class="directory">/var/spool/mail</filename> is the
+old location of the user mailboxes. The location that is used nowadays
+is /var/mail. Issue the following command to modify the mailbox
+location:</para>
+
+<para><screen><userinput>sed 's%/var/spool/mail%/var/mail%' \
+&nbsp;&nbsp;&nbsp;&nbsp;etc/login.defs.linux &gt; /etc/login.defs</userinput></screen></para>
+
+<para>According to the manpage of <userinput>vipw</userinput>,
+a <userinput>vigr</userinput> symlink should exist. Because the
+shadow installation procedure doesn't create this symlink, it
+must be created manually:</para>
+
+<para><screen><userinput>ln -s vipw /usr/sbin/vigr</userinput></screen></para>
+
+<para>The <filename>vipw</filename> link is currently pointing
+to a non-existing file. Since this file isn't needed here, remove
+it:</para>
+
+<para><screen><userinput>rm /bin/vipw</userinput></screen></para>
+
+<para>Move the <userinput>sg</userinput> program to the
+<filename class="directory">/usr/bin</filename> directory:</para>
+
+<para><screen><userinput>mv /bin/sg /usr/bin</userinput></screen></para>
+
+<para>Move Shadow's dynamic libraries to a more appropriate location:</para>
+
+<para><screen><userinput>mv /usr/lib/lib{shadow,misc}.so.0* /lib</userinput></screen></para>
+
+<para>The libraries have been moved, but some packages expect to
+find them in them in the
+<filename class="directory">/usr/lib</filename> directory. To account
+for this, create the following symlinks:</para>
+
+<para><screen><userinput>ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so &amp;&amp;
 ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so</userinput></screen></para>
 
 <para>Sh-utils and Shadow Password Suite each install a unique
 <filename>groups</filename> program. If you wish, you may remove the
 <filename>groups</filename> program installed by the Shadow Password
-Suite by running the following command:</para>
+Suite:</para>
 
 <para><screen><userinput>rm /bin/groups</userinput></screen></para>
 
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml
index 6cb816613..cc8b60fc3 100644
--- a/chapter06/shadowpwd.xml
+++ b/chapter06/shadowpwd.xml
@@ -5,9 +5,8 @@
 <screen>Estimated build time:           &shadow-time;
 Estimated required disk space:  &shadow-compsize;</screen>
 
-&c6-shadowpwd-inst;
-&c6-shadowpwd-exp;
-&aa-shadowpwd-desc;
+&aa-shadowpwd-shortdesc;
 &aa-shadowpwd-dep;
+&c6-shadowpwd-inst;
 
 </sect1>