commit dd6a4c3b30b5831e8a23c0763142c669e8798080 Author: Douglas Silas dhensley@redhat.com Date: Mon Jun 21 13:29:04 2010 +0200
GenParams, NetInterfaces: mk DG modprobe.conf-clean
Fix BZ#594479: make final chgs to bonding sections to instruct in modprobe.d/ use; only mention modprobe.conf as deprecated.
en-US/General_Parameters_and_Modules.xml | 56 +++++++++++++++--------------- en-US/Network_Interfaces.xml | 16 ++++----- 2 files changed, 35 insertions(+), 37 deletions(-) --- diff --git a/en-US/General_Parameters_and_Modules.xml b/en-US/General_Parameters_and_Modules.xml index c312b96..011d2a7 100644 --- a/en-US/General_Parameters_and_Modules.xml +++ b/en-US/General_Parameters_and_Modules.xml @@ -49,46 +49,46 @@ <screen> ~]$ <command>/sbin/lsmod</command> Module Size Used by -autofs4 25618 3 -sunrpc 231823 1 -bonding 115826 0 -ip6t_REJECT 4641 2 -nf_conntrack_ipv6 19623 2 -ip6table_filter 2895 1 +autofs4 25618 3 +sunrpc 231823 1 +bonding 115826 0 +ip6t_REJECT 4641 2 +nf_conntrack_ipv6 19623 2 +ip6table_filter 2895 1 ip6_tables 19232 1 ip6table_filter ipv6 322766 61 bonding,ip6t_REJECT,nf_conntrack_ipv6 -dm_mirror 13723 0 +dm_mirror 13723 0 dm_region_hash 11920 1 dm_mirror dm_log 9944 2 dm_mirror,dm_region_hash -uinput 8126 0 -sg 30478 0 -sr_mod 16066 0 -snd_ens1370 23085 4 +uinput 8126 0 +sg 30478 0 +sr_mod 16066 0 +snd_ens1370 23085 4 gameport 10783 1 snd_ens1370 snd_rawmidi 22955 1 snd_ens1370 cdrom 39833 1 sr_mod -snd_seq 56461 0 +snd_seq 56461 0 snd_seq_device 6634 2 snd_rawmidi,snd_seq snd_pcm 83399 1 snd_ens1370 snd_timer 22304 4 snd_seq,snd_pcm snd 70077 12 snd_ens1370,snd_rawmidi,snd_seq,snd_seq_device,snd_pcm,snd_timer -virtio_net 15937 0 -i2c_piix4 12707 0 +virtio_net 15937 0 +i2c_piix4 12707 0 soundcore 7892 1 snd -joydev 10514 0 +joydev 10514 0 snd_page_alloc 8604 2 snd_ens1370,snd_pcm i2c_core 31338 1 i2c_piix4 -virtio_balloon 3599 0 -ext4 362885 2 +virtio_balloon 3599 0 +ext4 362885 2 mbcache 7510 1 ext4 jbd2 98427 1 ext4 -virtio_blk 5159 3 -ata_generic 3619 0 -pata_acpi 3675 0 -virtio_pci 6741 0 +virtio_blk 5159 3 +ata_generic 3619 0 +pata_acpi 3675 0 +virtio_pci 6741 0 virtio_ring 6026 1 virtio_pci virtio 4864 4 virtio_net,virtio_balloon,virtio_blk,virtio_pci -ata_piix 22532 0 +ata_piix 22532 0 dm_mod 73839 8 dm_mirror,dm_log</screen> <para>The first column lists the names of modules; the second column lists the sizes of the modules, and the third column lists the use counts. The output from the <command>/sbin/lsmod</command> command is less verbose and easier to read than the output of <filename>cat /proc/modules</filename>.</para> <indexterm @@ -930,9 +930,9 @@ fi</programlisting> continuation="restarts" inheritnum="ignore"> <listitem> - <para>Add the following line to <filename>/etc/modprobe.conf</filename>:</para> + <para>As root, create a new file named <filename><replaceable><bonding></replaceable>.conf</filename> in the <filename>/etc/modprobe.d/</filename> directory. Note that you can name this file anything you like as long as it ends with a <filename>.conf</filename> extension. Insert the following line in this new file:</para> <screen>alias bond<replaceable><N></replaceable> bonding</screen> - <para>Replace <replaceable><N></replaceable> with the interface number, such as <command>0</command>. For each configured channel bonding interface, there must be a corresponding entry in <filename>/etc/modprobe.conf</filename>.</para> + <para>Replace <replaceable><N></replaceable> with the interface number, such as <command>0</command>. For each configured channel bonding interface, there must be a corresponding entry in your new <filename>/etc/modprobe.d/<replaceable><bonding></replaceable>.conf</filename> file.</para> </listitem> <listitem> <para>Configure a channel bonding interface as outlined in <xref @@ -968,11 +968,11 @@ fi</programlisting> <screen>~]# ifconfig bond0 up</screen> <para>If you have correctly created the <filename>ifcfg-bond0</filename> bonding interface file, you will be able to see <computeroutput>bond0</computeroutput> listed in the output of running <command>ifconfig</command> (without any options):</para> <screen>~]# ifconfig -bond0 Link encap:Ethernet HWaddr 00:00:00:00:00:00 +bond0 Link encap:Ethernet HWaddr 00:00:00:00:00:00 UP BROADCAST RUNNING MASTER MULTICAST MTU:1500 Metric:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 - collisions:0 txqueuelen:0 + collisions:0 txqueuelen:0 RX bytes:0 (0.0 b) TX bytes:0 (0.0 b)
eth0 Link encap:Ethernet HWaddr 52:54:00:26:9E:F1 @@ -981,13 +981,13 @@ eth0 Link encap:Ethernet HWaddr 52:54:00:26:9E:F1 UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:207 errors:0 dropped:0 overruns:0 frame:0 TX packets:205 errors:0 dropped:0 overruns:0 carrier:0 - collisions:0 txqueuelen:1000 + collisions:0 txqueuelen:1000 RX bytes:70374 (68.7 KiB) TX bytes:25298 (24.7 KiB)
<lineannotation>[output truncated]</lineannotation> </screen> <para>To view all existing bonds, even if they are not up, run:</para> - <screen>~]# cat /sys/class/net/bonding_masters + <screen>~]# cat /sys/class/net/bonding_masters bond0</screen> <para>You can configure each bond individually by manipulating the files located in the <filename>/sys/class/net/bond<replaceable><N></replaceable>/bonding/</filename> directory. First, the bond you are configuring must be taken down:</para> <screen>~]# ifconfig bond0 down</screen> diff --git a/en-US/Network_Interfaces.xml b/en-US/Network_Interfaces.xml index 2ad89e8..3c270b8 100644 --- a/en-US/Network_Interfaces.xml +++ b/en-US/Network_Interfaces.xml @@ -179,8 +179,7 @@ ONBOOT=yes</screen> <para>sets the configuration parameters for the bonding device, and is used in <filename>/etc/sysconfig/network-scripts/ifcfg-bond<replaceable><N></replaceable> </filename> (see <xref linkend="s2-networkscripts-interfaces-chan"/>). These parameters are identical to those used for bonding devices in <filename>/sys/class/net/<replaceable><bonding device></replaceable>/bonding</filename>, and the module parameters for the bonding driver as described in <emphasis><filename>bonding</filename> Module Directives</emphasis>.</para> - <para>This configuration method is used so that multiple bonding devices can have different configurations. If you use <command>BONDING_OPTS</command> in <filename>ifcfg-<replaceable><name></replaceable> - </filename>, do <emphasis>not</emphasis> use <filename>/etc/modprobe.conf</filename> to specify options for the bonding device.</para> + <para>This configuration method is used so that multiple bonding devices can have different configurations. It is highly recommened to place all of your bonding options after the <command>BONDING_OPTS</command> directive in <filename>ifcfg-<replaceable><name></replaceable></filename>. Do <emphasis>not</emphasis> specify options for the bonding device in <filename>/etc/modprobe.d/<replaceable><bonding></replaceable>.conf</filename>, or in the deprecated <filename>/etc/modprobe.conf</filename> file.</para> </listitem> </varlistentry> <varlistentry> @@ -476,15 +475,14 @@ SLAVE=yes USERCTL=no </screen> <para>In this example, replace <replaceable><N></replaceable> with the numerical value for the interface.</para> - <para>For a channel bonding interface to be valid, the kernel module must be loaded. To ensure that the module is loaded when the channel bonding interface is brought up, add the following line to <filename>/etc/modprobe.conf</filename>:</para> - <screen> -<command>alias bond<replaceable><N></replaceable> bonding</command> - </screen> - <para>Replace <replaceable><N></replaceable> with the number of the interface, such as <command>0</command>.</para> + <para>For a channel bonding interface to be valid, the kernel module must be loaded. To ensure that the module is loaded when the channel bonding interface is brought up, create a new file as root named <filename><replaceable><bonding></replaceable>.conf</filename> in the <filename>/etc/modprobe.d/</filename> directory. Note that you can name this file anything you like as long as it ends with a <filename>.conf</filename> extension. Insert the following line in this new file:</para> + <screen>alias bond<replaceable><N></replaceable> bonding</screen> + <para>Replace <replaceable><N></replaceable> with the interface number, such as <command>0</command>. For each configured channel bonding interface, there must be a corresponding entry in your new <filename>/etc/modprobe.d/<replaceable><bonding></replaceable>.conf</filename> file.</para> <important> - <title>Important: put all bonding module parameters in ifcfg-bondN files</title> + <title>Important: put all bonding module parameters in ifcfg-bondN files</title> <para>Parameters for the bonding kernel module must be specified as a space-separated list in the <parameter - class="option">BONDING_OPTS="<replaceable><bonding parameters></replaceable>"</parameter> directive in the ifcfg-bond<replaceable><N></replaceable> interface file. They should <emphasis>not</emphasis> be placed in <filename>/etc/modprobe.conf</filename>. For further instructions and advice on configuring the bonding module and to view the list of bonding parameters, refer to <xref linkend="s2-modules-bonding"/>.</para> + class="option">BONDING_OPTS="<replaceable><bonding parameters></replaceable>"</parameter> directive in the ifcfg-bond<replaceable><N></replaceable> interface file. Do <emphasis>not</emphasis> specify options for the bonding device in <filename>/etc/modprobe.d/<replaceable><bonding></replaceable>.conf</filename>, or in the deprecated <filename>/etc/modprobe.conf</filename> file. For further instructions and advice on configuring the bonding module and to view the list of bonding parameters, refer to <xref + linkend="s2-modules-bonding"/>.</para> </important> </section> <section