Ignore:
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:
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/procps-ng.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-procps" role="wrap">
    9   <?dbhtml filename="procps.html"?>
    10 
    11   <title>Procps-&procps-version;</title>
    12 
    13   <indexterm zone="ch-system-procps">
    14     <primary sortas="a-Procps">Procps</primary>
     8<sect1 id="ch-system-procps-ng" role="wrap">
     9  <?dbhtml filename="procps-ng.html"?>
     10
     11  <title>Procps-ng-&procps-ng-version;</title>
     12
     13  <indexterm zone="ch-system-procps-ng">
     14    <primary sortas="a-Procps-ng">Procps-ng</primary>
    1515  </indexterm>
    1616
    … …  
    1818    <title/>
    1919
    20     <para>The Procps package contains programs for monitoring
     20    <para>The Procps-ng package contains programs for monitoring
    2121    processes.</para>
    2222
    … …  
    2424
    2525  <sect2 role="installation">
    26     <title>Installation of Procps</title>
    27 
    28     <para os="p1">The following patch adds process control group support to
    29     ps:</para>
    30 
    31 <screen os="p2"><userinput>patch -Np1 -i ../&procps-ps_cgroup-patch;</userinput></screen>
    32 
    33     <para os="p3">The following patch fixes an issue where some procps utils
    34     print an error on the screen if the monitor isn't running at 60Hz:</para>
    35 
    36 <screen os="p4"><userinput>patch -Np1 -i ../&procps-fix_HZ_errors-patch;</userinput></screen>
    37 
    38     <para os="s1">The following fixes an issue with Make 3.82:</para>
    39 
    40 <screen os="s2"><userinput>sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' Makefile</userinput></screen>
    41 
    42     <para os="a">Compile the package:</para>
    43 
    44 <screen os="b"><userinput>make</userinput></screen>
    45 
    46     <para os="c">This package does not come with a test suite.</para>
    47 
    48     <para os="d">Install the package:</para>
    49 
    50 <screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install</userinput></screen>
     26    <title>Installation of Procps-ng</title>
     27
     28    <para os="a">Prepare procps-ng for compilation:</para>
     29
     30<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix= \
     31    --libdir=/usr/lib --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
     32    --disable-kill</userinput></screen>
     33
     34    <variablelist os="c">
     35      <title>The meaning of the configure options:</title>   
     36      <varlistentry>
     37        <term><parameter>--disable-kill</parameter></term>
     38        <listitem>
     39          <para>This switch disables building the kill command that
     40          was installed in the util-linux package.</para>
     41        </listitem>
     42      </varlistentry>
     43    </variablelist>
     44
     45    <para os="d">Compile the package:</para>
     46
     47<screen os="e"><userinput>make</userinput></screen>
     48
     49    <note os="note1">
     50      <para>When using the boot method, two tests will fail if the hostname is
     51      not set:</para>
     52
     53<screen><userinput remap="test">hostname clfs</userinput></screen>
     54    </note>
     55
     56    <para os="f">Remove the test which fails when scripting does not use a tty
     57    device. Run the following commands:</para>
     58
     59<screen os="g"><userinput remap="test">sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp
     60make check</userinput></screen>
     61
     62    <para os="h">Install the package:</para>
     63
     64<screen os="i"><userinput>make install</userinput></screen>
     65
     66    <para os="j">Move essential files to a location that can be found if <filename class="directory">/usr</filename> is not mounted.</para>
     67
     68<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
     69mv -v /usr/lib/libprocps.so.* /lib
     70ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</userinput></screen>
    5171
    5272  </sect2>
    5373
    54   <sect2 id="contents-procps" role="content">
    55     <title>Contents of Procps</title>
     74  <sect2 id="contents-procps-ng" role="content">
     75    <title>Contents of Procps-ng</title>
    5676
    5777    <segmentedlist>
    5878      <segtitle>Installed programs</segtitle>
    5979      <segtitle>Installed library</segtitle>
     80      <segtitle>Installed directories</segtitle>
    6081
    6182      <seglistitem>
    62         <seg>free, pgrep, pkill, pmap, ps, pwdx, skill, slabtop, snice, sysctl,
    63         tload, top, uptime, vmstat, w, and watch</seg>
    64         <seg>libproc.so</seg>
     83        <seg>free, pgrep, pidof, pkill, pmap, ps, pwdx, slabtop, sysctl, tload,
     84        top, uptime, vmstat, w, and watch</seg>
     85        <seg>libprocps.{a,so}</seg>
     86        <seg>/usr/include/proc, /usr/share/doc/procps-ng-&procps-ng-version;</seg>
    6587      </seglistitem>
    6688    </segmentedlist>
    … …  
    7698          <para>Reports the amount of free and used memory (both physical and
    7799          swap memory) in the system</para>
    78           <indexterm zone="ch-system-procps free">
     100          <indexterm zone="ch-system-procps-ng free">
    79101            <primary sortas="b-free">free</primary>
    80102          </indexterm>
    … …  
    86108        <listitem>
    87109          <para>Looks up processes based on their name and other attributes</para>
    88           <indexterm zone="ch-system-procps pgrep">
     110          <indexterm zone="ch-system-procps-ng pgrep">
    89111            <primary sortas="b-pgrep">pgrep</primary>
     112          </indexterm>
     113        </listitem>
     114      </varlistentry>
     115
     116      <varlistentry id="pidof">
     117        <term><command>pidof</command></term>
     118        <listitem>
     119          <para>Looks up processes based on their name and other attributes</para>
     120          <indexterm zone="ch-system-procps-ng pidof">
     121            <primary sortas="b-pidof">pidof</primary>
    90122          </indexterm>
    91123        </listitem>
    … …  
    96128        <listitem>
    97129          <para>Signals processes based on their name and other attributes</para>
    98           <indexterm zone="ch-system-procps pkill">
     130          <indexterm zone="ch-system-procps-ng pkill">
    99131            <primary sortas="b-pkill">pkill</primary>
    100132          </indexterm>
    … …  
    106138        <listitem>
    107139          <para>Reports the memory map of the given process</para>
    108           <indexterm zone="ch-system-procps pmap">
     140          <indexterm zone="ch-system-procps-ng pmap">
    109141            <primary sortas="b-pmap">pmap</primary>
    110142          </indexterm>
    … …  
    116148        <listitem>
    117149          <para>Lists the current running processes</para>
    118           <indexterm zone="ch-system-procps ps">
     150          <indexterm zone="ch-system-procps-ng ps">
    119151            <primary sortas="b-ps">ps</primary>
    120152          </indexterm>
    … …  
    126158        <listitem>
    127159          <para>Reports the current working directory of a process</para>
    128           <indexterm zone="ch-system-procps pwdx">
     160          <indexterm zone="ch-system-procps-ng pwdx">
    129161            <primary sortas="b-pwdx">pwdx</primary>
    130           </indexterm>
    131         </listitem>
    132       </varlistentry>
    133 
    134       <varlistentry id="skill">
    135         <term><command>skill</command></term>
    136         <listitem>
    137           <para>Sends signals to processes matching the given criteria</para>
    138           <indexterm zone="ch-system-procps skill">
    139             <primary sortas="b-skill">skill</primary>
    140162          </indexterm>
    141163        </listitem>
    … …  
    146168        <listitem>
    147169          <para>Displays detailed kernel slab cache information in real time</para>
    148           <indexterm zone="ch-system-procps slabtop">
     170          <indexterm zone="ch-system-procps-ng slabtop">
    149171            <primary sortas="b-slabtop">slabtop</primary>
    150172          </indexterm>
    … …  
    152174      </varlistentry>
    153175
    154       <varlistentry id="snice">
    155         <term><command>snice</command></term>
    156         <listitem>
    157           <para>Changes the scheduling priority of processes matching the given
    158           criteria</para>
    159           <indexterm zone="ch-system-procps snice">
    160             <primary sortas="b-snice">snice</primary>
    161           </indexterm>
    162         </listitem>
    163       </varlistentry>
    164176
    165177      <varlistentry id="sysctl">
    … …  
    167179        <listitem>
    168180          <para>Modifies kernel parameters at run time</para>
    169           <indexterm zone="ch-system-procps sysctl">
     181          <indexterm zone="ch-system-procps-ng sysctl">
    170182            <primary sortas="b-sysctl">sysctl</primary>
    171183          </indexterm>
    … …  
    177189        <listitem>
    178190          <para>Prints a graph of the current system load average</para>
    179           <indexterm zone="ch-system-procps tload">
     191          <indexterm zone="ch-system-procps-ng tload">
    180192            <primary sortas="b-tload">tload</primary>
    181193          </indexterm>
    … …  
    188200          <para>Displays a list of the most CPU intensive processes; it
    189201          provides an ongoing look at processor activity in real time</para>
    190           <indexterm zone="ch-system-procps top">
     202          <indexterm zone="ch-system-procps-ng top">
    191203            <primary sortas="b-top">top</primary>
    192204          </indexterm>
    … …  
    199211          <para>Reports how long the system has been running, how many users are
    200212          logged on, and the system load averages</para>
    201           <indexterm zone="ch-system-procps uptime">
     213          <indexterm zone="ch-system-procps-ng uptime">
    202214            <primary sortas="b-uptime">uptime</primary>
    203215          </indexterm>
    … …  
    211223          processes, memory, paging, block Input/Output (IO), traps, and CPU
    212224          activity</para>
    213           <indexterm zone="ch-system-procps vmstat">
     225          <indexterm zone="ch-system-procps-ng vmstat">
    214226            <primary sortas="b-vmstat">vmstat</primary>
    215227          </indexterm>
    … …  
    222234          <para>Shows which users are currently logged on, where, and since
    223235          when</para>
    224           <indexterm zone="ch-system-procps w">
     236          <indexterm zone="ch-system-procps-ng w">
    225237            <primary sortas="b-w">w</primary>
    226238          </indexterm>
    … …  
    234246          screen-full of its output; this allows a user to watch the output
    235247          change over time</para>
    236           <indexterm zone="ch-system-procps watch">
     248          <indexterm zone="ch-system-procps-ng watch">
    237249            <primary sortas="b-watch">watch</primary>
    238250          </indexterm>
    … …  
    240252      </varlistentry>
    241253
    242       <varlistentry id="libproc">
    243         <term><filename class="libraryfile">libproc</filename></term>
     254      <varlistentry id="libprocps">
     255        <term><filename class="libraryfile">libprocps</filename></term>
    244256        <listitem>
    245257          <para>Contains the functions used by most programs in this
    246258          package</para>
    247           <indexterm zone="ch-system-procps libproc">
    248             <primary sortas="c-libproc">libproc</primary>
     259          <indexterm zone="ch-system-procps-ng libprocps">
     260            <primary sortas="c-libprocps">libprocps</primary>
    249261          </indexterm>
    250262        </listitem>
Note: See TracChangeset for help on using the changeset viewer.