Changeset 7b1982e


Ignore:
Timestamp:
Aug 16, 2014, 10:23:49 PM (8 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
cec0a99
Parents:
c02c97a
git-author:
Chris Staub <chris@…> (08/16/2014 10:23:33 PM)
git-committer:
Chris Staub <chris@…> (08/16/2014 10:23:49 PM)
Message:

Consolidated sed commands

Location:
BOOK
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • BOOK/boot/common/shadow.xml

    rc02c97a r7b1982e  
    2323    <title>Installation of Shadow</title>
    2424
    25     <para os="a">Disable the installation of the <command>groups</command> and
    26     <command>nologin</command> programs, as better versions
    27     of these programs are provided by Coreutils and Util-linux:</para>
     25    <para os="a">Run the following <command>sed</command> command to disable
     26    the installation of the <command>groups</command> and
     27    <command>nologin</command> programs, as better versions of these programs
     28    are provided by other packages, and prevent Shadow from setting the suid
     29    bit on its installed programs:</para>
    2830
    2931<screen os="b"><userinput>cp -v src/Makefile.in{,.orig}
    30 sed -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /' \
     32sed -e 's/groups$(EXEEXT) //' \
     33    -e 's/= nologin$(EXEEXT)/= /' \
     34    -e 's/\(^suidu*bins = \).*/\1/' \
    3135    src/Makefile.in.orig &gt; src/Makefile.in</userinput></screen>
    3236
    33     <para os="c">Prevent Shadow from setting installed programs suid:</para>
    34 
    35 <screen os="d"><userinput>cp -v src/Makefile.in{,.orig}
    36 sed 's/\(^suidu*bins = \).*/\1/' src/Makefile.in.orig &gt; src/Makefile.in</userinput></screen>
    37 
    38     <para os="e">Tell Shadow to use <command>passwd</command> in
     37    <para os="c">Tell Shadow to use <command>passwd</command> in
    3938    <filename class="directory">/tools/bin</filename>:</para>
    4039
    41 <screen os="f"><userinput>cat > config.cache &lt;&lt; "EOF"
     40<screen os="d"><userinput>cat > config.cache &lt;&lt; "EOF"
    4241shadow_cv_passwd_dir=/tools/bin
    4342EOF</userinput></screen>
    4443
    45     <para os="g">Prepare Shadow for compilation:</para>
     44    <para os="e">Prepare Shadow for compilation:</para>
    4645
    47 <screen os="h"><userinput>./configure --prefix=/tools \
     46<screen os="f"><userinput>./configure --prefix=/tools \
    4847    --build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
    4948
    50     <para os="i">Compile the package:</para>
     49    <para os="g">Compile the package:</para>
    5150
    52 <screen os="j"><userinput>make</userinput></screen>
     51<screen os="h"><userinput>make</userinput></screen>
    5352
    54     <para os="k">Install the package:</para>
     53    <para os="i">Install the package:</para>
    5554
    56 <screen os="l"><userinput>make install</userinput></screen>
     55<screen os="j"><userinput>make install</userinput></screen>
    5756
    5857  </sect2>
  • BOOK/introduction/common/changelog.xml

    rc02c97a r7b1982e  
    3838
    3939    <listitem>
     40      <para>17 August 2014</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[Chris] - Combined Makefile modification commands in
     44          Boot section Shadow install into one command.</para>
     45        </listitem>
     46      </itemizedlist>
     47    </listitem>
     48
     49    <listitem>
    4050      <para>14 August 2014</para>
    4151      <itemizedlist>
Note: See TracChangeset for help on using the changeset viewer.