Changeset f584773 for BOOK/boot/common

Timestamp:

Apr 14, 2014, 1:49:16 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

4b9dcd7

Parents:

47cb63d

Message:

Use passwd in /tools

Location:

BOOK/boot/common

Files:

• createfiles.xml (modified) (1 diff)
• shadow.xml (modified) (1 diff)

BOOK/boot/common/createfiles.xml

@@ -16 +16 @@
   the next chapter after the software has been installed.</para>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,passwd,pwd,stty} ${CLFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,login,pwd,stty} ${CLFS}/bin
 ln -sv /tools/bin/file ${CLFS}/usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib

BOOK/boot/common/shadow.xml

@@ -48 +48 @@
   </variablelist>
 
+    <para os="h">Tell Shadow to use passwd in /tools/bin:</para>
 
-    <para os="h">Compile the package:</para>
+<screen os="i"><userinput>cp config.h{,.orig}
+sed '/PASSWD_PROGRAM/s@/bin/passwd@/tools&amp;@' config.h.orig &gt; config.h</userinput></screen>
 
-<screen os="i"><userinput>make</userinput></screen>
+    <para os="j">Compile the package:</para>
 
-    <para os="j">This package does not come with a test suite.</para>
+<screen os="k"><userinput>make</userinput></screen>
 
-    <para os="k">Install the package:</para>
+    <para os="l">This package does not come with a test suite.</para>
 
-<screen os="l"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+    <para os="m">Install the package:</para>
+
+<screen os="n"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>