Changeset 03e6a40 for BOOK/boot/common/shadow.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/boot/common/shadow.xml (modified) (1 diff)

BOOK/boot/common/shadow.xml

@@ -23 +23 @@
     <title>Installation of Shadow</title>
 
-    <para os="b">Disable the installation of the <command>groups</command>
-    program, as Coreutils provides a better version:</para>
+    <para os="b">Disable the installation of the <command>groups</command> and
+    <command>nologin</command> programs, as better versions
+    of these programs are provided by Coreutils and Util-linux:</para>
 
 <screen os="c"><userinput>cp -v src/Makefile.in{,.orig}
-sed -e 's/groups$(EXEEXT) //' src/Makefile.in.orig > src/Makefile.in</userinput></screen>
+sed  -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /' \
+    src/Makefile.in.orig > src/Makefile.in</userinput></screen>
 
     <para os="d">Prepare Shadow for compilation:</para>
 
 <screen os="e"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --sysconfdir=/etc</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
-<para os="f">The meaning of the configure options:</para>
+    <para os="f">Tell Shadow to use <command>passwd</command> in
+    <filename class="directory">/tools/bin</filename>:</para>
 
-  <variablelist os="g">
-    <varlistentry>
-      <term><parameter>--sysconfdir=/etc</parameter></term>
-      <listitem><para>Tells Shadow to install its configuration files into
-      <filename class="directory">/etc</filename>, rather than
-      <filename class="directory">/tools/etc</filename>.</para></listitem>
-    </varlistentry>
-    
-  </variablelist>
+<screen os="g"><userinput>cp config.h{,.orig}
+sed '/PASSWD_PROGRAM/s@/bin/passwd@/tools&amp;@' config.h.orig &gt; config.h</userinput></screen>
 
+    <para os="h">Prevent Shadow from setting installed programs suid:</para>
 
-    <para os="h">Compile the package:</para>
+<screen os="i"><userinput>cp -v src/Makefile{,.orig}
+sed 's/\(^suidu*bins = \).*/\1/' src/Makefile.orig &gt; src/Makefile</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">Install the package:</para>
 
-<screen os="l"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="m"><userinput>make install</userinput></screen>
 
   </sect2>