Changeset 7b1982e

Timestamp:

Aug 16, 2014, 10:23:49 PM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

cec0a99

Parents:

c02c97a

git-author:

Chris Staub <chris@…> (08/16/14 22:23:33)

git-committer:

Chris Staub <chris@…> (08/16/14 22:23:49)

Message:

Consolidated sed commands

Location:

BOOK

Files:

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

BOOK/boot/common/shadow.xml

@@ -23 +23 @@
     <title>Installation of Shadow</title>
 
-    <para os="a">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>
+    <para os="a">Run the following <command>sed</command> command to disable
+    the installation of the <command>groups</command> and
+    <command>nologin</command> programs, as better versions of these programs
+    are provided by other packages, and prevent Shadow from setting the suid
+    bit on its installed programs:</para>
 
 <screen os="b"><userinput>cp -v src/Makefile.in{,.orig}
-sed -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /' \
+sed -e 's/groups$(EXEEXT) //' \
+    -e 's/= nologin$(EXEEXT)/= /' \
+    -e 's/\(^suidu*bins = \).*/\1/' \
     src/Makefile.in.orig &gt; src/Makefile.in</userinput></screen>
 
-    <para os="c">Prevent Shadow from setting installed programs suid:</para>
-
-<screen os="d"><userinput>cp -v src/Makefile.in{,.orig}
-sed 's/\(^suidu*bins = \).*/\1/' src/Makefile.in.orig &gt; src/Makefile.in</userinput></screen>
-
-    <para os="e">Tell Shadow to use <command>passwd</command> in
+    <para os="c">Tell Shadow to use <command>passwd</command> in
     <filename class="directory">/tools/bin</filename>:</para>
 
-<screen os="f"><userinput>cat > config.cache &lt;&lt; "EOF"
+<screen os="d"><userinput>cat > config.cache &lt;&lt; "EOF"
 shadow_cv_passwd_dir=/tools/bin
 EOF</userinput></screen>
 
-    <para os="g">Prepare Shadow for compilation:</para>
+    <para os="e">Prepare Shadow for compilation:</para>
 
-<screen os="h"><userinput>./configure --prefix=/tools \
+<screen os="f"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
 
-    <para os="i">Compile the package:</para>
+    <para os="g">Compile the package:</para>
 
-<screen os="j"><userinput>make</userinput></screen>
+<screen os="h"><userinput>make</userinput></screen>
 
-    <para os="k">Install the package:</para>
+    <para os="i">Install the package:</para>
 
-<screen os="l"><userinput>make install</userinput></screen>
+<screen os="j"><userinput>make install</userinput></screen>
 
   </sect2>

BOOK/introduction/common/changelog.xml

@@ -38 +38 @@
 
     <listitem>
+      <para>17 August 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Combined Makefile modification commands in
+          Boot section Shadow install into one command.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>14 August 2014</para>
       <itemizedlist>