Ignore:
Timestamp:
Jul 3, 2009, 11:32:29 AM (15 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
65a1d51
Parents:
acf32d0 (diff), 602aa77 (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' of git@…:cross-lfs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/module-init-tools.xml

    racf32d0 r392a73c  
    8888
    8989      <seglistitem>
    90         <seg>depmod, generate-modprobe.conf, insmod, insmod.static,
    91         lsmod (link to insmod), modinfo, modprobe (link to insmod), and
    92         rmmod (link to insmod)</seg>
     90        <seg>depmod, insmod, insmod.static, lsmod (link to insmod), modinfo,
     91        modprobe (link to insmod), and rmmod (link to insmod)</seg>
    9392      </seglistitem>
    9493    </segmentedlist>
     
    108107          <indexterm zone="ch-system-module-init-tools depmod">
    109108            <primary sortas="b-depmod">depmod</primary>
    110           </indexterm>
    111         </listitem>
    112       </varlistentry>
    113 
    114       <varlistentry id="generate-modprobe.conf">
    115         <term><command>generate-modprobe.conf</command></term>
    116         <listitem>
    117           <para>Creates a modprobe.conf file from an existing 2.2 or 2.4
    118           module setup</para>
    119           <indexterm zone="ch-system-module-init-tools generate-modprobe.conf">
    120             <primary sortas="b-generate-modprobe.conf">generate-modprobe.conf</primary>
    121109          </indexterm>
    122110        </listitem>
Note: See TracChangeset for help on using the changeset viewer.