Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/shadow.xml

    rec008670 r229ed25  
    3434    </note>
    3535
    36     <para os="f1">Fix an issue with the Russian man pages:</para>
    37 
    38     <screen os="f2"><userinput>sed -i 's/man_MANS = $(man_nopam) /man_MANS = /' man/ru/Makefile.in</userinput></screen>
    39 
    40     <para os="b">Prepare Shadow for compilation:</para>
    41 
    42 <screen os="c"><userinput>./configure --sysconfdir=/etc</userinput></screen>
    43 
    44 <para os="d">The meaning of the configure options:</para>
    45 
    46   <variablelist os="e">
     36
     37    <para os="b">Disable the installation of the <command>groups</command> and
     38    <command>nologin</command> programs and their man pages, as better versions
     39    of these programs are provided by Coreutils and Util-linux:</para>
     40
     41<screen os="c"><userinput>sed -i src/Makefile.in \
     42  -e 's/groups$(EXEEXT) //' -e 's/= nologin$(EXEEXT)/= /'
     43find man -name Makefile.in -exec sed -i \
     44  -e 's/man1\/groups\.1 //' -e 's/man8\/nologin\.8 //' '{}' \;</userinput></screen>
     45
     46    <para os="d">Prepare Shadow for compilation:</para>
     47
     48<screen os="e"><userinput>./configure --sysconfdir=/etc</userinput></screen>
     49
     50<para os="f">The meaning of the configure options:</para>
     51
     52  <variablelist os="g">
    4753    <varlistentry>
    4854      <term><parameter>--sysconfdir=/etc</parameter></term>
     
    5157      <filename class="directory">/usr/etc</filename>.</para></listitem>
    5258    </varlistentry>
     59   
    5360  </variablelist>
    5461
    55     <para os="f">Disable the installation of the <command>groups</command>
    56     program and its man pages, as Coreutils provides a better version:</para>
    57 
    58 <screen os="g"><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
    59 find man -name Makefile -exec sed -i '/groups.1.xml/d' '{}' \;
    60 find man -name Makefile -exec sed -i 's/groups.1 //' '{}' \;</userinput></screen>
    6162
    6263    <para os="h">Compile the package:</para>
     
    7273    <para os="m" id="shadow-login_defs">Instead of using the default
    7374    <emphasis>crypt</emphasis> method, use the more secure
    74     <emphasis>MD5</emphasis> method of password encryption, which also allows
     75    <emphasis>SHA512</emphasis> method of password encryption, which also allows
    7576    passwords longer than 8 characters. It is also necessary to change the
    7677    obsolete <filename class="directory">/var/spool/mail</filename> location
     
    8586
    8687<screen os="s"><userinput>sed -i /etc/login.defs \
    87     -e 's@#\(ENCRYPT_METHOD \).*@\1MD5@' \
     88    -e 's@#\(ENCRYPT_METHOD \).*@\1SHA512@' \
    8889    -e 's@/var/spool/mail@/var/mail@'</userinput></screen>
    8990
     
    155156        <seg>chage, chfn, chpasswd, chgpasswd, chsh, expiry, faillog, gpasswd,
    156157        groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
    157         lastlog, login, logoutd, newgrp, newusers, nologin, passwd, pwck,
     158        lastlog, login, logoutd, newgrp, newusers, passwd, pwck,
    158159        pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
    159160        vigr (link to vipw), and vipw</seg>
     
    380381      </varlistentry>
    381382
    382       <varlistentry id="nologin">
    383         <term><command>nologin</command></term>
    384         <listitem>
    385           <para>Displays a message that an account is not available. Designed
    386           to be used as the default shell for accounts that have been
    387           disabled</para>
    388           <indexterm zone="ch-system-shadow nologin">
    389             <primary sortas="b-nologin">nologin</primary>
    390           </indexterm>
    391         </listitem>
    392       </varlistentry>
    393 
    394383      <varlistentry id="passwd">
    395384        <term><command>passwd</command></term>
Note: See TracChangeset for help on using the changeset viewer.