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 moved

Legend:

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

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-module-init-tools" role="wrap">
    9   <?dbhtml filename="module-init-tools.html"?>
     8<sect1 id="ch-system-kmod" role="wrap">
     9  <?dbhtml filename="kmod.html"?>
    1010
    11   <title>Module-Init-Tools-&module-init-tools-version;</title>
     11  <title>Kmod-&kmod-version;</title>
    1212
    13   <indexterm zone="ch-system-module-init-tools">
    14     <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
     13  <indexterm zone="ch-system-kmod">
     14    <primary sortas="a-Kmod">Kmod</primary>
    1515  </indexterm>
    1616
     
    1818    <title/>
    1919
    20     <para>The Module-Init-Tools package contains programs for handling kernel
    21     modules in Linux kernels greater than or equal to version 2.5.47.</para>
     20    <para>The Kmod package contains programs for loading, inserting
     21      and removing kernel modules for Linux. Kmod replaces the
     22      Module-Init-tools package.</para>
    2223
    2324  </sect2>
    2425
    2526  <sect2 role="installation">
    26     <title>Installation of Module-Init-Tools</title>
     27    <title>Installation of Kmod</title>
    2728
    28     <para os="c">Issue the following commands to perform the tests</para>
     29    <para os="a">Prepare Kmod for compilation:</para>
    2930
    30 <screen os="d"><userinput>sed -i "s/\(make\)\( all\)/\1 DOCBOOKTOMAN=true\2/" tests/runtests &amp;&amp;
    31 ./tests/runtests</userinput></screen>
     31<screen os="b"><userinput>./configure --prefix=/usr \
     32    --bindir=/bin --sysconfdir=/etc \
     33    --with-rootlibdir=/lib --disable-manpages \
     34    --with-zlib --with-xz</userinput></screen>
    3235
    33     <para os="e">Prepare Module-Init-Tools for compilation:</para>
    34 
    35 <screen os="f"><userinput>./configure --prefix=/usr \
    36     --bindir=/bin --sbindir=/sbin \
    37     --enable-zlib-dynamic</userinput></screen>
    38 
    39     <variablelist os="g">
     36    <variablelist os="c">
    4037      <title>The meaning of the configure option:</title>
    4138
    4239      <varlistentry>
    43         <term><parameter>--enable-zlib-dynamic</parameter></term>
     40        <term><parameter>--with-rootlibdir=/lib</parameter></term>
    4441        <listitem>
    45           <para>This allows the Module-Init-Tools package to handle compressed
    46           kernel modules.</para>
     42          <para>Install location for shared libraries.</para>
     43        </listitem>
     44      </varlistentry>
     45
     46      <varlistentry>
     47        <term><parameter>--with-zlib --with-xz</parameter></term>
     48        <listitem>
     49          <para>This allows the Kmod package to handle zlib and XZ
     50            compressed kernel modules.</para>
    4751        </listitem>
    4852      </varlistentry>
     
    5054    </variablelist>
    5155
    52     <para os="h">Compile the package:</para>
     56    <para os="d">Compile the package:</para>
    5357
    54 <screen os="i"><userinput>make DOCBOOKTOMAN=true</userinput></screen>
     58<screen os="e"><userinput>make</userinput></screen>
    5559
    56     <para os="j">Install the package:</para>
     60    <para os="f">To test the results, issue:</para>
    5761
    58 <screen os="k"><userinput>make install</userinput></screen>
     62<screen os="f2"><userinput remap="test">make check</userinput></screen>
    5963
     64    <para os="g">Install the package:</para>
     65
     66<screen os="h"><userinput>make install
     67make -C man install</userinput></screen>
     68
     69    <para os="i">Create symbolic links for programs that expect Module-Init-Tools.</para>
     70
     71<screen os="j"><userinput>ln -sfv kmod /bin/lsmod
     72ln -sfv ../bin/kmod /sbin/depmod
     73ln -sfv ../bin/kmod /sbin/insmod
     74ln -sfv ../bin/kmod /sbin/modprobe
     75ln -sfv ../bin/kmod /sbin/modinfo
     76ln -sfv ../bin/kmod /sbin/rmmod</userinput></screen>
     77 
    6078  </sect2>
    6179
    62   <sect2 id="contents-module-init-tools" role="content">
    63     <title>Contents of Module-Init-Tools</title>
     80  <sect2 id="contents-kmod" role="content">
     81    <title>Contents of Kmod</title>
    6482
    6583    <segmentedlist>
     
    6785
    6886      <seglistitem>
    69         <seg>depmod, insmod, insmod.static, lsmod, modinfo, modprobe, and
     87        <seg>depmod, insmod, kmod, lsmod, modinfo, modprobe, and
    7088        rmmod</seg>
    7189      </seglistitem>
     
    84102          <command>modprobe</command> to automatically load the required
    85103          modules</para>
    86           <indexterm zone="ch-system-module-init-tools depmod">
     104          <indexterm zone="ch-system-kmod depmod">
    87105            <primary sortas="b-depmod">depmod</primary>
    88106          </indexterm>
     
    94112        <listitem>
    95113          <para>Installs a loadable module in the running kernel</para>
    96           <indexterm zone="ch-system-module-init-tools insmod">
     114          <indexterm zone="ch-system-kmod insmod">
    97115            <primary sortas="b-insmod">insmod</primary>
    98116          </indexterm>
     
    100118      </varlistentry>
    101119
    102       <varlistentry id="insmod.static">
    103         <term><command>insmod.static</command></term>
     120      <varlistentry id="kmod">
     121        <term><command>kmod</command></term>
    104122        <listitem>
    105           <para>A statically compiled version of <command>insmod</command></para>
    106           <indexterm zone="ch-system-module-init-tools insmod.static">
    107             <primary sortas="b-insmod.static">insmod.static</primary>
     123          <para>Loads and unloads kernel modules</para>
     124          <indexterm zone="ch-system-kmod kmod">
     125            <primary sortas="b-kmod">kmod</primary>
    108126          </indexterm>
    109127        </listitem>
     
    114132        <listitem>
    115133          <para>Lists currently loaded modules</para>
    116           <indexterm zone="ch-system-module-init-tools lsmod">
     134          <indexterm zone="ch-system-kmod lsmod">
    117135            <primary sortas="b-lsmod">lsmod</primary>
    118136          </indexterm>
     
    125143          <para>Examines an object file associated with a kernel module and
    126144          displays any information that it can glean</para>
    127           <indexterm zone="ch-system-module-init-tools modinfo">
     145          <indexterm zone="ch-system-kmod modinfo">
    128146            <primary sortas="b-modinfo">modinfo</primary>
    129147          </indexterm>
     
    136154          <para>Uses a dependency file, created by <command>depmod</command>,
    137155          to automatically load relevant modules</para>
    138           <indexterm zone="ch-system-module-init-tools modprobe">
     156          <indexterm zone="ch-system-kmod modprobe">
    139157            <primary sortas="b-modprobe">modprobe</primary>
    140158          </indexterm>
     
    146164        <listitem>
    147165          <para>Unloads modules from the running kernel</para>
    148           <indexterm zone="ch-system-module-init-tools rmmod">
     166          <indexterm zone="ch-system-kmod rmmod">
    149167            <primary sortas="b-rmmod">rmmod</primary>
    150168          </indexterm>
Note: See TracChangeset for help on using the changeset viewer.