Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (10 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/util-linux.xml

    rec008670 r229ed25  
    3333    <command>hwclock</command> program FHS-compliant, run the following:</para>
    3434
    35 <screen><userinput>sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
    36     hwclock/hwclock.c
     35<screen><userinput>sed -i -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
     36    $(grep -rl '/etc/adjtime' .)
    3737mkdir -pv /var/lib/hwclock</userinput></screen>
    3838
    … …  
    4444    <para os="a">Prepare Util-linux for compilation:</para>
    4545
    46 <screen os="b"><userinput>./configure --enable-arch \
    47     --enable-partx --enable-write --disable-wall</userinput></screen>
     46<screen os="b"><userinput>./configure --enable-write</userinput></screen>
    4847
    4948    <variablelist os="c">
    … …  
    5150
    5251      <varlistentry>
    53         <term><parameter>--enable-arch</parameter></term>
    54         <listitem>
    55           <para>This option allows the <command>arch</command> program to be
    56           installed.</para>
    57         </listitem>
    58       </varlistentry>
    59 
    60       <varlistentry>
    61         <term><parameter>--enable-partx</parameter></term>
    62         <listitem>
    63           <para>Enables building the <command>addpart</command>, <command>delpart</command>,
    64            <command>partx</command> programs.</para>
    65         </listitem>
    66       </varlistentry>
    67 
    68       <varlistentry>
    6952        <term><parameter>--enable-write</parameter></term>
    7053        <listitem>
    … …  
    7457      </varlistentry>
    7558
    76       <varlistentry>
    77         <term><parameter>--disable-wall</parameter></term>
    78         <listitem>
    79           <para>Disables building the <command>wall</command> program,
    80           as the Sysvinit package installs its own version.</para>
    81         </listitem>
    82       </varlistentry>
    83 
    8459    </variablelist>
    8560
    … …  
    8863<screen os="e"><userinput>make</userinput></screen>
    8964
    90     <para os="f">This package does not come with a test suite.</para>
     65    <para os="dummy1">Create two <systemitem class="groupname">dummy</systemitem> groups and a <systemitem class="username">dummy</systemitem> user to be used during Util-linux and Coreutils test suites:</para>
     66
     67<screen os="dummy2"><userinput remap="test">echo "dummy1:x:1000:" &gt;&gt; /etc/group
     68echo "dummy2:x:1001:dummy" &gt;&gt; /etc/group
     69echo "dummy:x:1000:1000::/root:/bin/bash" &gt;&gt; /etc/passwd</userinput></screen>
     70
     71    <para os="f">To test the results, issue:</para>
     72
     73<screen os="f2"><userinput remap="test">chown -Rv dummy . &amp;&amp;
     74su dummy -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
    9175
    9276    <para os="g">Install the package:</para>
    … …  
    10589
    10690      <seglistitem>
    107         <seg>addpart, agetty, arch, blkid, blockdev, cal, cfdisk, chkdupexe,
    108         chrt, col, colcrt, colrm, column, ctrlaltdel, cytune, ddate, delpart,
    109         dmesg, fdformat, fdisk, findfs, flock, fsck, fsck.cramfs, fsck.minix,
    110         getopt, hexdump, hwclock, ionice, ipcmk, ipcrm, ipcs, isosize,
    111         ldattach, line, logger, look, losetup, lscpu, mcookie, mkfs, mkfs.bfs,
    112         mkfs.cramfs, mkfs.minix, mkswap, more, mount, namei, partx, pg,
    113         pivot_root, readprofile, rename, renice, rev, rtcwake, script,
    114         scriptreplay, setarch, setsid, setterm, sfdisk, swapoff (link to
    115         swapon), swapon, switch_root, tailf, taskset, tunelp, ul, umount,
    116         uuidd, uuidgen, whereis, and write</seg>
    117         <seg>libblkid.[a,so] and libuuid.[a,so]</seg>
    118         <seg>/usr/include/blkid, /usr/include/uuid, /usr/share/getopt,
    119         /var/lib/hwclock</seg>
     91        <seg>addpart, agetty, blkdiscard, blkid, blockdev, cal, cfdisk, chcpu,
     92        chrt, col, colcrt, colrm, column, ctrlaltdel, cytune, delpart,
     93        dmesg, eject, fallocate, fdformat, fdisk, findfs, findmnt, flock,
     94        fsck, fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump,
     95        hwclock, ionice, ipcmk, ipcrm, ipcs, isosize, kill, last, lastb (link
     96        to last), ldattach, logger, look, losetup, lsblk, lscpu, lslocks,
     97        mcookie, mesg, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, more,
     98        mount, mountpoint,  namei, nologin, nsenter, partx, pg, pivot_root, prlimit,
     99        raw, readprofile, rename, renice, resizepart, rev, rtcwake, script,
     100        scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
     101        swapoff, swapon, switch_root, tailf, taskset, ul, umount, unshare,
     102        utmpdump, uuidd, uuidgen, wall, wdctl, whereis, wipefs, and write</seg>
     103        <seg>libblkid.[a,so], libmount.[a,so], and libuuid.[a,so]</seg>
     104        <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
     105        /usr/share/doc/util-linux/getopt, /var/lib/hwclock</seg>
    120106      </seglistitem>
    121107    </segmentedlist>
    … …  
    147133      </varlistentry>
    148134
    149       <varlistentry id="arch">
    150         <term><command>arch</command></term>
    151         <listitem>
    152           <para>Reports the machine's architecture</para>
    153           <indexterm zone="ch-system-util-linux arch">
    154             <primary sortas="b-arch">arch</primary>
     135      <varlistentry id="blkdiscard">
     136        <term><command>blkdiscard</command></term>
     137        <listitem>
     138          <para>Discards sectors on a device</para>
     139          <indexterm zone="ch-system-util-linux blkdiscard">
     140            <primary sortas="b-blkdiscard">blkdiscard</primary>
    155141          </indexterm>
    156142        </listitem>
    … …  
    199185      </varlistentry>
    200186
    201       <varlistentry id="chkdupexe">
    202         <term><command>chkdupexe</command></term>
    203         <listitem>
    204           <para>Finds duplicate executables</para>
    205           <indexterm zone="ch-system-util-linux chkdupexe">
    206             <primary sortas="b-chkdupexe">chkdupexe</primary>
     187      <varlistentry id="chcpu">
     188        <term><command>chcpu</command></term>
     189        <listitem>
     190          <para>Utility to configure CPUs</para>
     191          <indexterm zone="ch-system-util-linux chcpu">
     192            <primary sortas="b-chcpu">chcpu</primary>
    207193          </indexterm>
    208194        </listitem>
    … …  
    313299      </varlistentry>
    314300
     301      <varlistentry id="eject">
     302        <term><command>eject</command></term>
     303        <listitem>
     304          <para>Eject removable media</para>
     305          <indexterm zone="ch-system-util-linux eject">
     306            <primary sortas="b-dmesg">eject</primary>
     307          </indexterm>
     308        </listitem>
     309      </varlistentry>
     310
     311      <varlistentry id="fallocate">
     312        <term><command>fallocate</command></term>
     313        <listitem>
     314          <para>Preallocates space to a file</para>
     315          <indexterm zone="ch-system-util-linux fallocate">
     316            <primary sortas="b-fallocate">fallocate</primary>
     317          </indexterm>
     318        </listitem>
     319      </varlistentry>
     320
    315321      <varlistentry id="fdformat">
    316322        <term><command>fdformat</command></term>
    … …  
    344350      </varlistentry>
    345351
     352      <varlistentry id="findmnt">
     353        <term><command>findmnt</command></term>
     354        <listitem>
     355          <para>Lists mounted filesystems or searches for a filesystem</para>
     356          <indexterm zone="ch-system-util-linux findmnt">
     357            <primary sortas="b-findmnt">findmnt</primary>
     358          </indexterm>
     359        </listitem>
     360      </varlistentry>
     361
    346362      <varlistentry id="flock">
    347363        <term><command>flock</command></term>
    … …  
    383399          <indexterm zone="ch-system-util-linux fsck.minix">
    384400            <primary sortas="b-fsck.minix">fsck.minix</primary>
     401          </indexterm>
     402        </listitem>
     403      </varlistentry>
     404
     405      <varlistentry id="fsfreeze">
     406        <term><command>fsfreeze</command></term>
     407        <listitem>
     408          <para>Suspends and resumes access to a filesystem</para>
     409          <indexterm zone="ch-system-util-linux fsfreeze">
     410            <primary sortas="b-fsfreeze">fsfreeze</primary>
     411          </indexterm>
     412        </listitem>
     413      </varlistentry>
     414
     415      <varlistentry id="fstrim">
     416        <term><command>fstrim</command></term>
     417        <listitem>
     418          <para>Discards unused blocks on a mounted filesystem</para>
     419          <indexterm zone="ch-system-util-linux fstrim">
     420            <primary sortas="b-fstrim">fstrim</primary>
    385421          </indexterm>
    386422        </listitem>
    … …  
    470506      </varlistentry>
    471507
     508      <varlistentry id="kill">
     509        <term><command>kill</command></term>
     510        <listitem>
     511          <para>Send a signal to a process</para>
     512          <indexterm zone="ch-system-util-linux kill">
     513            <primary sortas="b-kill">kill</primary>
     514          </indexterm>
     515        </listitem>
     516      </varlistentry>
     517
     518      <varlistentry id="last">
     519        <term><command>last</command></term>
     520        <listitem>
     521          <para>Shows which users last logged in (and out), searching back
     522          through the <filename>/var/log/wtmp</filename> file; it also shows
     523          system boots, shutdowns, and run-level changes</para>
     524          <indexterm zone="ch-system-util-linux last">
     525            <primary sortas="b-last">last</primary>
     526          </indexterm>
     527        </listitem>
     528      </varlistentry>
     529
     530      <varlistentry id="lastb">
     531        <term><command>lastb</command></term>
     532        <listitem>
     533          <para>Shows the failed login attempts, as logged in
     534          <filename>/var/log/btmp</filename></para>
     535          <indexterm zone="ch-system-util-linux lastb">
     536            <primary sortas="b-lastb">lastb</primary>
     537          </indexterm>
     538        </listitem>
     539      </varlistentry>
     540
    472541      <varlistentry id="ldattach">
    473542        <term><command>ldattach</command></term>
    … …  
    480549      </varlistentry>
    481550
    482       <varlistentry id="line">
    483         <term><command>line</command></term>
    484         <listitem>
    485           <para>Copies a single line</para>
    486           <indexterm zone="ch-system-util-linux line">
    487             <primary sortas="b-line">line</primary>
    488           </indexterm>
    489         </listitem>
    490       </varlistentry>
    491 
    492551      <varlistentry id="logger">
    493552        <term><command>logger</command></term>
    … …  
    520579      </varlistentry>
    521580
     581      <varlistentry id="lsblk">
     582        <term><command>lsblk</command></term>
     583        <listitem>
     584          <para>Prints information about block devices</para>
     585          <indexterm zone="ch-system-util-linux lsblk">
     586            <primary sortas="b-lsblk">lsblk</primary>
     587          </indexterm>
     588        </listitem>
     589      </varlistentry>
     590
    522591      <varlistentry id="lscpu">
    523592        <term><command>lscpu</command></term>
    … …  
    526595          <indexterm zone="ch-system-util-linux lscpu">
    527596            <primary sortas="b-lscpu">lscpu</primary>
     597          </indexterm>
     598        </listitem>
     599      </varlistentry>
     600
     601      <varlistentry id="lslocks">
     602        <term><command>lslocks</command></term>
     603        <listitem>
     604          <para>Lists local system locks</para>
     605          <indexterm zone="ch-system-util-linux lslocks">
     606            <primary sortas="b-lslocks">lslocks</primary>
    528607          </indexterm>
    529608        </listitem>
    … …  
    541620      </varlistentry>
    542621
     622      <varlistentry id="mesg">
     623        <term><command>mesg</command></term>
     624        <listitem>
     625          <para>Controls whether other users can send messages to the current
     626          user's terminal</para>
     627          <indexterm zone="ch-system-util-linux mesg">
     628            <primary sortas="b-mesg">mesg</primary>
     629          </indexterm>
     630        </listitem>
     631      </varlistentry>
     632
    543633      <varlistentry id="mkfs">
    544634        <term><command>mkfs</command></term>
    … …  
    614704      </varlistentry>
    615705
     706      <varlistentry id="mountpoint">
     707        <term><command>mountpoint</command></term>
     708        <listitem>
     709          <para>Tells you whether or not a directory is a mount point.</para>
     710          <indexterm zone="ch-system-util-linux mountpoint">
     711            <primary sortas="b-mountpoint">mountpoint</primary>
     712          </indexterm>
     713        </listitem>
     714      </varlistentry>
     715
    616716      <varlistentry id="namei">
    617717        <term><command>namei</command></term>
    … …  
    620720          <indexterm zone="ch-system-util-linux namei">
    621721            <primary sortas="b-namei">namei</primary>
     722          </indexterm>
     723        </listitem>
     724      </varlistentry>
     725
     726      <varlistentry id="nologin">
     727        <term><command>nologin</command></term>
     728        <listitem>
     729          <para>Displays a message that an account is not available. Designed
     730          to be used as the default shell for accounts that have been
     731          disabled</para>
     732          <indexterm zone="ch-system-util-linux nologin">
     733            <primary sortas="b-nologin">nologin</primary>
     734          </indexterm>
     735        </listitem>
     736      </varlistentry>
     737
     738      <varlistentry id="nsenter">
     739        <term><command>nsenter</command></term>
     740        <listitem>
     741          <para>Runs a program with namespaces of other processes</para>
     742          <indexterm zone="ch-system-util-linux nsenter">
     743            <primary sortas="b-nsenter">nsenter</primary>
    622744          </indexterm>
    623745        </listitem>
    … …  
    656778      </varlistentry>
    657779
     780      <varlistentry id="prlimit">
     781        <term><command>prlimit</command></term>
     782        <listitem>
     783          <para>Gets and sets a process' resource limits</para>
     784          <indexterm zone="ch-system-util-linux prlimit">
     785            <primary sortas="b-prlimit">prlimit</primary>
     786          </indexterm>
     787        </listitem>
     788      </varlistentry>
     789
     790      <varlistentry id="raw">
     791        <term><command>raw</command></term>
     792        <listitem>
     793          <para>Binds a Linux raw character device to a block device</para>
     794          <indexterm zone="ch-system-util-linux raw">
     795            <primary sortas="b-raw">raw</primary>
     796          </indexterm>
     797        </listitem>
     798      </varlistentry>
     799
    658800      <varlistentry id="readprofile">
    659801        <term><command>readprofile</command></term>
    … …  
    687829      </varlistentry>
    688830
     831      <varlistentry id="resizepart">
     832        <term><command>resizepart</command></term>
     833        <listitem>
     834          <para>Asks the Linux kernel to resize a partition</para>
     835          <indexterm zone="ch-system-util-linux resizepart">
     836            <primary sortas="b-resizepart">resizepart</primary>
     837          </indexterm>
     838        </listitem>
     839      </varlistentry>
     840
    689841      <varlistentry id="rev">
    690842        <term><command>rev</command></term>
    … …  
    764916          <indexterm zone="ch-system-util-linux sfdisk">
    765917            <primary sortas="b-sfdisk">sfdisk</primary>
     918          </indexterm>
     919        </listitem>
     920      </varlistentry>
     921
     922      <varlistentry id="sulogin">
     923        <term><command>sulogin</command></term>
     924        <listitem>
     925          <para>Allows <emphasis>root</emphasis> to log in; it is normally
     926          invoked by <command>init</command> when the system goes into single
     927          user mode</para>
     928          <indexterm zone="ch-system-util-linux sulogin">
     929            <primary sortas="b-sulogin">sulogin</primary>
     930          </indexterm>
     931        </listitem>
     932      </varlistentry>
     933
     934      <varlistentry id="swaplabel">
     935        <term><command>swaplabel</command></term>
     936        <listitem>
     937          <para>Prints or changes the label or UUID of a swap area</para>
     938          <indexterm zone="ch-system-util-linux swaplabel">
     939            <primary sortas="b-swaplabel">swaplabel</primary>
    766940          </indexterm>
    767941        </listitem>
    … …  
    821995      </varlistentry>
    822996
    823       <varlistentry id="tunelp">
    824         <term><command>tunelp</command></term>
    825         <listitem>
    826           <para>Tunes the parameters of the line printer</para>
    827           <indexterm zone="ch-system-util-linux tunelp">
    828             <primary sortas="b-tunelp">tunelp</primary>
    829           </indexterm>
    830         </listitem>
    831       </varlistentry>
    832 
    833997      <varlistentry id="ul">
    834998        <term><command>ul</command></term>
    … …  
    8481012          <indexterm zone="ch-system-util-linux umount">
    8491013            <primary sortas="b-umount">umount</primary>
     1014          </indexterm>
     1015        </listitem>
     1016      </varlistentry>
     1017
     1018      <varlistentry id="unshare">
     1019        <term><command>unshare</command></term>
     1020        <listitem>
     1021          <para>Runs a program with some namespaces unshared from parent</para>
     1022          <indexterm zone="ch-system-util-linux unshare">
     1023            <primary sortas="b-unshare">unshare</primary>
     1024          </indexterm>
     1025        </listitem>
     1026      </varlistentry>
     1027
     1028      <varlistentry id="utmpdump">
     1029        <term><command>utmpdump</command></term>
     1030        <listitem>
     1031          <para>Displays the content of the given login file in a more
     1032          user-friendly format</para>
     1033          <indexterm zone="ch-system-util-linux utmpdump">
     1034            <primary sortas="b-utmpdump">utmpdump</primary>
    8501035          </indexterm>
    8511036        </listitem>
    … …  
    8751060      </varlistentry>
    8761061
     1062      <varlistentry id="wall">
     1063        <term><command>wall</command></term>
     1064        <listitem>
     1065          <para>Writes a message to all logged-in users</para>
     1066          <indexterm zone="ch-system-util-linux wall">
     1067            <primary sortas="b-wall">wall</primary>
     1068          </indexterm>
     1069        </listitem>
     1070      </varlistentry>
     1071
     1072      <varlistentry id="wdctl">
     1073        <term><command>wdctl</command></term>
     1074        <listitem>
     1075          <para>Show hardware watchdog status</para>
     1076          <indexterm zone="ch-system-util-linux wdctl">
     1077            <primary sortas="b-uuidgen">wdctl</primary>
     1078          </indexterm>
     1079        </listitem>
     1080      </varlistentry>
     1081
    8771082      <varlistentry id="whereis">
    8781083        <term><command>whereis</command></term>
    … …  
    8861091      </varlistentry>
    8871092
     1093      <varlistentry id="wipefs">
     1094        <term><command>wipefs</command></term>
     1095        <listitem>
     1096          <para>Wipes a filesystem signature from a device</para>
     1097          <indexterm zone="ch-system-util-linux wipefs">
     1098            <primary sortas="b-wipefs">wipefs</primary>
     1099          </indexterm>
     1100        </listitem>
     1101      </varlistentry>
     1102
    8881103      <varlistentry id="write">
    8891104        <term><command>write</command></term>
    … …  
    9081123      </varlistentry>
    9091124
     1125      <varlistentry id="libmount">
     1126        <term><filename class="libraryfile">libmount</filename></term>
     1127        <listitem>
     1128          <para>Contains routines for parsing the
     1129          <filename>/etc/fstab</filename>, <filename>/etc/mtab</filename>,
     1130          and <filename>/proc/self/mountinfo</filename> files, managing
     1131          <filename>/etc/mtab</filename>, and configuring various mount
     1132          options</para>
     1133          <indexterm zone="ch-system-util-linux libmount">
     1134            <primary sortas="c-libmount">libmount</primary>
     1135          </indexterm>
     1136        </listitem>
     1137      </varlistentry>
     1138
    9101139      <varlistentry id="libuuid">
    9111140        <term><filename class="libraryfile">libuuid</filename></term>
Note: See TracChangeset for help on using the changeset viewer.