[networking-guide] master: num_unsol_na is not supported by NM (41afbd4)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit 41afbd4524c43e64084f93f7473f722f037869f2
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Sep 3 22:14:56 2014 +0200
num_unsol_na is not supported by NM
>---------------------------------------------------------------
en-US/Configure_Network_Bonding.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/en-US/Configure_Network_Bonding.xml b/en-US/Configure_Network_Bonding.xml
index e7aa73a..7afe67e 100644
--- a/en-US/Configure_Network_Bonding.xml
+++ b/en-US/Configure_Network_Bonding.xml
@@ -427,7 +427,7 @@ Then when complete, bring up all the slaves, which will bring up the bond (provi
<screen>~]# <command>nmcli con load /etc/sysconfig/network-scripts/ifcfg-<replaceable>device</replaceable></command></screen>
Alternatively, to reload all interfaces:
<screen>~]# <command>nmcli con reload</command></screen>
- The default behavior is for <application>NetworkManager</application> not to be aware of the changes and to continue using the old configuration data. The is set by the <option>monitor-connection-files</option> option in the <filename>NetworkManager.conf</filename> file. See the <filename>NetworkManager.conf(5)</filename> manual page for more information.
+ The default behavior is for <application>NetworkManager</application> not to be aware of the changes and to continue using the old configuration data. The is set by the <option>monitor-connection-files</option> option in the <filename>NetworkManager.conf</filename> file. See the <filename>NetworkManager.conf(5)</filename> manual page for more information.
</para>
<para>
@@ -734,7 +734,7 @@ bond0</screen>
</itemizedlist>
</listitem>
</varlistentry>
- <varlistentry>
+ <!--<varlistentry>
<term>
<literal>num_unsol_na=<replaceable><number></replaceable>
</literal>
@@ -743,7 +743,7 @@ bond0</screen>
<para>Specifies the number of unsolicited <systemitem class="protocol">IPv6</systemitem> Neighbor Advertisements to be issued after a failover event. One unsolicited NA is issued immediately after the failover.</para>
<para>The valid range is <userinput>0 - 255</userinput>; the default value is <userinput>1</userinput>. This parameter affects only the active-backup mode.</para>
</listitem>
- </varlistentry>
+ </varlistentry> not supported by NM -->
<varlistentry>
<term>
<literal>primary=<replaceable><interface_name></replaceable>
9 years, 7 months
[networking-guide] master: Creating Multiple Bonds (9868b2f)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit 9868b2f64ce1eabe81dfbc9cb98c2dfc5a224cf0
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Sep 3 22:08:22 2014 +0200
Creating Multiple Bonds
>---------------------------------------------------------------
en-US/Configure_Network_Bonding.xml | 48 +++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/en-US/Configure_Network_Bonding.xml b/en-US/Configure_Network_Bonding.xml
index a437c6d..e7aa73a 100644
--- a/en-US/Configure_Network_Bonding.xml
+++ b/en-US/Configure_Network_Bonding.xml
@@ -444,6 +444,54 @@ Then when complete, bring up all the slaves, which will bring up the bond (provi
</para>
</section>
+
+
+ <section id="sec-Creating_Multiple_Bonds">
+ <title>Creating Multiple Bonds</title>
+ <para>
+ In &MAJOROSVER;, for each bond a channel bonding interface is created including the <command>BONDING_OPTS</command> directive. This configuration method is used so that multiple bonding devices can have different configurations. To create multiple channel bonding interfaces, proceed as follows:
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ Create multiple <filename>ifcfg-bond<replaceable>N</replaceable></filename> files with the <command>BONDING_OPTS</command> directive; this directive will cause the network scripts to create the bond interfaces as required.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Create, or edit existing, interface configuration files to be bonded and include the <command>SLAVE</command> directive.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Assign the interfaces to be bonded, the slave interfaces, to the channel bonding interfaces by means of the <command>MASTER</command> directive.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+
+ <example id="ex-Example-multiple-bondN_interface_configuration_files">
+ <title>Example multiple ifcfg-bondN interface configuration files</title>
+
+ <para>
+ The following is an example of a channel bonding interface configuration file:
+ <programlisting>DEVICE=bondN
+NAME=bondN
+TYPE=Bond
+IPADDR=192.168.1.1
+NETMASK=255.255.255.0
+ONBOOT=yes
+BOOTPROTO=none
+BONDING_OPTS="<replaceable>bonding parameters separated by spaces</replaceable>"</programlisting>
+</para>
+ <para>
+ In this example, replace <replaceable>N</replaceable> with the number for the bond interface. For example, to create two bonds create two configuration files, <filename>ifcfg-bond0</filename> and <filename>ifcfg-bond1</filename>, with appropriate <systemitem class="protocol">IP</systemitem> addresses.
+ </para>
+ </example>
+
+ <para>
+ Create the interfaces to be bonded as per <xref linkend="ex-Example_Slave_Interface_Configuration_File" /> and assign them to the bond interfaces as required using the <command>MASTER=bond<replaceable>N</replaceable></command> directive. For example, continuing on from the example above, if two interfaces per bond are required, then for two bonds create four interface configuration files and assign the first two using <command>MASTER=bond<replaceable>0</replaceable></command> and the next two using <command>MASTER=bond<replaceable>1</replaceable></command>.</para>
+ </section>
</section>
<section
9 years, 7 months
[networking-guide] master: Don't use max_bonds (80d7e55)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit 80d7e55e8262bbd4e9afe8dbf1b51d65582b0ac8
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Sep 3 22:00:15 2014 +0200
Don't use max_bonds
>---------------------------------------------------------------
en-US/Configure_Network_Bonding.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/en-US/Configure_Network_Bonding.xml b/en-US/Configure_Network_Bonding.xml
index d3e82ba..a437c6d 100644
--- a/en-US/Configure_Network_Bonding.xml
+++ b/en-US/Configure_Network_Bonding.xml
@@ -374,7 +374,10 @@ The NAME directive is useful for naming the connection profile in <application>N
<important>
<title>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 <option>BONDING_OPTS="<replaceable>bonding parameters</replaceable>"</option> directive in the <filename>ifcfg-bond<replaceable>N</replaceable></filename> 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, see <xref linkend="sec-Using_Channel_Bonding"/>.
+ Parameters for the bonding kernel module must be specified as a space-separated list in the <option>BONDING_OPTS="<replaceable>bonding parameters</replaceable>"</option> directive in the <filename>ifcfg-bond<replaceable>N</replaceable></filename> 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.</para>
+ <para>The <option>max_bonds</option> parameter is not interface specific and should not be set when using <filename>ifcfg-bond<replaceable>N</replaceable></filename> files with the <command>BONDING_OPTS</command> directive as this directive will cause the network scripts to create the bond interfaces as required.</para>
+ <para>
+ For further instructions and advice on configuring the bonding module and to view the list of bonding parameters, see <xref linkend="sec-Using_Channel_Bonding"/>.
</para>
</important>
9 years, 7 months
[networking-guide] master: Improve Channel bonding using ifcfg (f6ecc1e)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit f6ecc1ea229702f4390b23c31f413e732238621e
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Sep 3 21:56:21 2014 +0200
Improve Channel bonding using ifcfg
after jklimes review.
>---------------------------------------------------------------
en-US/Configure_Network_Bonding.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/en-US/Configure_Network_Bonding.xml b/en-US/Configure_Network_Bonding.xml
index 2c13a25..d3e82ba 100644
--- a/en-US/Configure_Network_Bonding.xml
+++ b/en-US/Configure_Network_Bonding.xml
@@ -352,20 +352,24 @@ See the <filename>modprobe(8)</filename> man page for more command options.
To create a channel bonding interface, create a file in the <filename class="directory">/etc/sysconfig/network-scripts/</filename> directory called <filename>ifcfg-bond<replaceable>N</replaceable></filename>, replacing <replaceable>N</replaceable> with the number for the interface, such as <filename>0</filename>.
</para>
<para>
- The contents of the file can be identical to whatever type of interface is getting bonded, such as an Ethernet interface. The only difference is that the <option>DEVICE</option> directive is <option>bond<replaceable>N</replaceable></option>, replacing <replaceable>N</replaceable> with the number for the interface. The <option>NM_CONTROLLED</option> directive can be added to prevent <application>NetworkManager</application> from configuring this device.
- </para>
- <para>
- The following is a sample channel bonding configuration file:
+ The contents of the file can be based on a configuration file for whatever type of interface is getting bonded, such as an Ethernet interface. The essential differences are that the <option>DEVICE</option> directive is <option>bond<replaceable>N</replaceable></option>, replacing <replaceable>N</replaceable> with the number for the interface, and TYPE=Bond. The <option>NM_CONTROLLED</option> directive can be added to prevent <application>NetworkManager</application> from configuring this device.
</para>
+
<example id="ex-Example_ifcfg-bond0_Interface_Configuration_File">
<title>Example ifcfg-bond0 Interface Configuration File</title>
+ <para>
+ An example of a channel bonding interface.
+ </para>
<programlisting>DEVICE=bond0
+NAME=bond0
+TYPE=Bond
IPADDR=192.168.1.1
NETMASK=255.255.255.0
ONBOOT=yes
BOOTPROTO=none
-NM_CONTROLLED=no
BONDING_OPTS="<replaceable>bonding parameters separated by spaces</replaceable>"</programlisting>
+<para>
+The NAME directive is useful for naming the connection profile in <application>NetworkManager</application>. ONBOOT says whether the profile should be started when booting (or more generally, when auto-connecting a device).</para>
</example>
<important>
<title>Put all Bonding Module Parameters in ifcfg-bondN Files</title>
9 years, 7 months
[networking-guide] master: cat /sys/class does not require root (314bd71)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit 314bd7161eb63f99c065173f5a591886d387ad8e
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Sep 3 21:55:22 2014 +0200
cat /sys/class does not require root
>---------------------------------------------------------------
en-US/Configure_Network_Bonding.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/en-US/Configure_Network_Bonding.xml b/en-US/Configure_Network_Bonding.xml
index c5c3fed..2c13a25 100644
--- a/en-US/Configure_Network_Bonding.xml
+++ b/en-US/Configure_Network_Bonding.xml
@@ -517,7 +517,7 @@ Then when complete, bring up all the slaves, which will bring up the bond (provi
4: bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT
link/ether 52:54:00:38:a6:4c brd ff:ff:ff:ff:ff:ff</screen>
<para>To view all existing bonds, even if they are not up, run:</para>
- <screen>~]# <command>cat /sys/class/net/bonding_masters</command>
+ <screen>~]$ <command>cat /sys/class/net/bonding_masters</command>
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>~]# <command>/usr/sbin/ifdown bond0</command>
9 years, 7 months
[networking-guide] master: Replace ifconfig with "ip link show" (c55228a)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit c55228ad614a4c70a7c6e1c4b2bcbfe984eadfba
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Sep 3 21:54:04 2014 +0200
Replace ifconfig with "ip link show"
>---------------------------------------------------------------
en-US/Configure_Network_Bonding.xml | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/en-US/Configure_Network_Bonding.xml b/en-US/Configure_Network_Bonding.xml
index 656980e..c5c3fed 100644
--- a/en-US/Configure_Network_Bonding.xml
+++ b/en-US/Configure_Network_Bonding.xml
@@ -506,24 +506,16 @@ Then when complete, bring up all the slaves, which will bring up the bond (provi
class="option">MASTER=bond0</parameter> directives in the configuration files for each interface bonded to bond0. Once this is completed, you can proceed to testing the parameters.</para>
<para>First, bring up the bond you created by running <command>/usr/sbin/ifup <option>bond<replaceable><N></replaceable></option></command> as <systemitem class="username">root</systemitem>:</para>
<screen>~]# <command>/usr/sbin/ifup bond0</command></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>~]# <command>ifconfig</command>
-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
- RX bytes:0 (0.0 b) TX bytes:0 (0.0 b)
-eth0 Link encap:Ethernet HWaddr 52:54:00:26:9E:F1
- inet addr:192.168.122.251 Bcast:192.168.122.255 Mask:255.255.255.0
- inet6 addr: fe80::5054:ff:fe26:9ef1/64 Scope:Link
- 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
- RX bytes:70374 (68.7 KiB) TX bytes:25298 (24.7 KiB)
-<lineannotation>[output truncated]</lineannotation>
- </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> ip link show</command> as <systemitem class="username">root</systemitem>:</para>
+ <screen>~]# <command>ip link show</command>
+1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN mode DEFAULT
+ link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
+2: eth0: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 state UP mode DEFAULT qlen 1000
+ link/ether 52:54:00:e9:ce:d2 brd ff:ff:ff:ff:ff:ff
+3: eth1: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 state UP mode DEFAULT qlen 1000
+ link/ether 52:54:00:38:a6:4c brd ff:ff:ff:ff:ff:ff
+4: bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT
+ link/ether 52:54:00:38:a6:4c brd ff:ff:ff:ff:ff:ff</screen>
<para>To view all existing bonds, even if they are not up, run:</para>
<screen>~]# <command>cat /sys/class/net/bonding_masters</command>
bond0</screen>
9 years, 7 months
[networking-guide] master: Activating a Channel Bond (eca15af)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit eca15afa287a33237d0f57c56bbd54e648517783
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Sep 3 21:53:05 2014 +0200
Activating a Channel Bond
>---------------------------------------------------------------
en-US/Configure_Network_Bonding.xml | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/en-US/Configure_Network_Bonding.xml b/en-US/Configure_Network_Bonding.xml
index f7b2935..656980e 100644
--- a/en-US/Configure_Network_Bonding.xml
+++ b/en-US/Configure_Network_Bonding.xml
@@ -400,6 +400,41 @@ SLAVE=yes</programlisting>
</example>
</section>
+ <section id="sec-Activating_a_Channel_Bond">
+ <title>Activating a Channel Bond</title>
+ <para>
+ To activate a bond, bring up all the slaves. As <systemitem class="username">root</systemitem>, issue the following commands:
+
+ <screen>~]# <command> /usr/sbin/ifup ifcfg-eth0</command>
+Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/7)</screen>
+ <screen>~]# <command> /usr/sbin/ifup ifcfg-eth1</command>
+Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/8)</screen>
+</para>
+<para>
+Note that if editing interface files for interfaces which are currently <quote>up</quote>, set them down first as follows:
+<synopsis>/usr/sbin/ifdown ifcfg-eth<replaceable>N</replaceable></synopsis>
+Then when complete, bring up all the slaves, which will bring up the bond (provided it was not set <quote>down</quote>).
+ </para>
+ <para>
+ To make <application>NetworkManager</application> aware of the changes, issue a command for every changed interface as <systemitem class="username">root</systemitem>:
+ <screen>~]# <command>nmcli con load /etc/sysconfig/network-scripts/ifcfg-<replaceable>device</replaceable></command></screen>
+ Alternatively, to reload all interfaces:
+<screen>~]# <command>nmcli con reload</command></screen>
+ The default behavior is for <application>NetworkManager</application> not to be aware of the changes and to continue using the old configuration data. The is set by the <option>monitor-connection-files</option> option in the <filename>NetworkManager.conf</filename> file. See the <filename>NetworkManager.conf(5)</filename> manual page for more information.
+ </para>
+
+ <para>
+ To view the status of the bond interface, issue the following command:
+ <screen>~]# <command>ip link show</command>
+1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN mode DEFAULT
+ link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
+2: eth0: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 state UP mode DEFAULT qlen 1000
+ link/ether 52:54:00:e9:ce:d2 brd ff:ff:ff:ff:ff:ff
+3: eth1: <BROADCAST,MULTICAST,SLAVE,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast master bond0 state UP mode DEFAULT qlen 1000
+ link/ether 52:54:00:38:a6:4c brd ff:ff:ff:ff:ff:ff
+4: bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT
+ link/ether 52:54:00:38:a6:4c brd ff:ff:ff:ff:ff:ff</screen>
+ </para>
</section>
</section>
9 years, 7 months
[networking-guide] master: Creating SLAVE Interfaces (57a536d)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit 57a536d5836f6d88d8edd1b8a1e493b5cd40fb30
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Sep 3 21:50:16 2014 +0200
Creating SLAVE Interfaces
was "Creating MASTER and SLAVE Interfaces"
but the "channel bonding interface" is the master.
>---------------------------------------------------------------
en-US/Configure_Network_Bonding.xml | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/en-US/Configure_Network_Bonding.xml b/en-US/Configure_Network_Bonding.xml
index 7d17c93..f7b2935 100644
--- a/en-US/Configure_Network_Bonding.xml
+++ b/en-US/Configure_Network_Bonding.xml
@@ -376,24 +376,29 @@ BONDING_OPTS="<replaceable>bonding parameters separated by spaces</replaceable>"
</section>
- <section id="sec-Creating_MASTER_and_SLAVE_Interfaces">
- <title>Creating MASTER and SLAVE Interfaces</title>
+ <section id="sec-Creating_SLAVE_Interfaces">
+ <title>Creating SLAVE Interfaces</title>
<para>
- After the channel bonding interface is created, the network interfaces to be bound together must be configured by adding the <option>MASTER</option> and <option>SLAVE</option> directives to their configuration files. The configuration files for each of the channel-bonded interfaces can be nearly identical.
+ The channel bonding interface is the <quote>master</quote> and the interfaces to be bonded are referred to as the <quote>slaves</quote>. After the channel bonding interface is created, the network interfaces to be bound together must be configured by adding the <option>MASTER</option> and <option>SLAVE</option> directives to the configuration files of the slaves. The configuration files for each of the slave interfaces can be nearly identical.
</para>
+ <example id="ex-Example_Slave_Interface_Configuration_File">
+ <title>Example Slave Interface Configuration File</title>
<para>
- For example, if two Ethernet interfaces are being channel bonded, both <systemitem class="etheraddress">eth0</systemitem> and <systemitem class="etheraddress">eth1</systemitem> may look like the following example:
+ For example, if two Ethernet interfaces are being channel bonded, <literal>eth0</literal> and <literal>eth1</literal>, they can both look like the following example:
</para>
<programlisting>DEVICE=eth<replaceable>N</replaceable>
+NAME=bond0-slave
+TYPE=Ethernet
BOOTPROTO=none
ONBOOT=yes
MASTER=bond0
-SLAVE=yes
-NM_CONTROLLED=no</programlisting>
+SLAVE=yes</programlisting>
<para>
- In this example, replace <replaceable>N</replaceable> with the numerical value for the interface.
+ In this example, replace <replaceable>N</replaceable> with the numerical value for the interface. Note that if more than one profile or configuration file exists with ONBOOT=yes for an interface, they may race with each other and a plain TYPE=Ethernet profile may be activated instead of a bond slave.
</para>
+ </example>
+ </section>
</section>
9 years, 7 months
[networking-guide] master: There is no USERCTL in Fedora 20 (20bf61b)
by stephenw
Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
>---------------------------------------------------------------
commit 20bf61b9d15865fcfb72bc625dc6896bb4b9d4f7
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Wed Sep 3 13:45:12 2014 +0200
There is no USERCTL in Fedora 20
>---------------------------------------------------------------
en-US/Configure_802_1Q_VLAN_Tagging.xml | 1 -
en-US/Configure_Network_Bonding.xml | 2 --
en-US/Configure_Network_Bridging.xml | 1 -
en-US/Configure_Networking.xml | 1 -
4 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/en-US/Configure_802_1Q_VLAN_Tagging.xml b/en-US/Configure_802_1Q_VLAN_Tagging.xml
index 2b2d4f7..2feb998 100644
--- a/en-US/Configure_802_1Q_VLAN_Tagging.xml
+++ b/en-US/Configure_802_1Q_VLAN_Tagging.xml
@@ -190,7 +190,6 @@ BOOTPROTO=none
ONBOOT=yes
IPADDR=192.168.1.1
NETMASK=255.255.255.0
-USERCTL=no
NETWORK=192.168.1.0
VLAN=yes</screen>
<para>
diff --git a/en-US/Configure_Network_Bonding.xml b/en-US/Configure_Network_Bonding.xml
index e7b5f51..7d17c93 100644
--- a/en-US/Configure_Network_Bonding.xml
+++ b/en-US/Configure_Network_Bonding.xml
@@ -364,7 +364,6 @@ IPADDR=192.168.1.1
NETMASK=255.255.255.0
ONBOOT=yes
BOOTPROTO=none
-USERCTL=no
NM_CONTROLLED=no
BONDING_OPTS="<replaceable>bonding parameters separated by spaces</replaceable>"</programlisting>
</example>
@@ -391,7 +390,6 @@ BOOTPROTO=none
ONBOOT=yes
MASTER=bond0
SLAVE=yes
-USERCTL=no
NM_CONTROLLED=no</programlisting>
<para>
In this example, replace <replaceable>N</replaceable> with the numerical value for the interface.
diff --git a/en-US/Configure_Network_Bridging.xml b/en-US/Configure_Network_Bridging.xml
index 62e6052..f62d74c 100644
--- a/en-US/Configure_Network_Bridging.xml
+++ b/en-US/Configure_Network_Bridging.xml
@@ -324,7 +324,6 @@ BRIDGE=br0</programlisting>
Create or edit two or more Ethernet interface configuration files, which are to be bonded, as follows:
<programlisting>DEVICE=ethX
TYPE=Ethernet
-USERCTL=no
SLAVE=yes
MASTER=bond0
BOOTPROTO=none
diff --git a/en-US/Configure_Networking.xml b/en-US/Configure_Networking.xml
index d1e9e11..616d298 100644
--- a/en-US/Configure_Networking.xml
+++ b/en-US/Configure_Networking.xml
@@ -1583,7 +1583,6 @@ BOOTPROTO=none
ONBOOT=yes
NETMASK=255.255.255.0
IPADDR=10.0.1.27
-USERCTL=no
NM_CONTROLLED=no</programlisting>
Optionally specify the hardware or MAC address using the <command>HWADDR</command> directive. Note that this will influence the device naming procedure as explained in <xref linkend="ch-Consistent_Network_Device_Naming" />. You do not need to specify the broadcast address as this is calculated automatically by <application>ipcalc</application>.
</para>
9 years, 7 months
[install-guide/F21-rewrite] Removing some markup because it rendered in a really confusing way
by pbokoc
commit eda55da6ab3a89e20ea8d3e0f2f529407b2150e1
Author: Petr Bokoc <pbokoc(a)redhat.com>
Date: Wed Sep 3 19:28:07 2014 +0200
Removing some markup because it rendered in a really confusing way
en-US/Boot_Options.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/en-US/Boot_Options.xml b/en-US/Boot_Options.xml
index 35287bd..37c085e 100644
--- a/en-US/Boot_Options.xml
+++ b/en-US/Boot_Options.xml
@@ -939,7 +939,7 @@ Password:
<option>ksdevice=link</option>
</entry>
<entry>
- Similar to the above, with the difference that network will always be activated in the initramfs, whether it is needed or not. The supported <option>rd.neednet</option> <application>dracut</application> option should be used to achieve the same result.
+ Similar to the above, with the difference that network will always be activated in the initramfs, whether it is needed or not. The supported <option>rd.neednet</option> option (provided by <application>dracut</application>) should be used instead.
</entry>
</row>
<row>
@@ -955,7 +955,7 @@ Password:
<option>ksdevice=ibft</option>
</entry>
<entry>
- Replaced with the <option>ip=ibft</option> <application>dracut</application> option
+ Replaced with the <option>ip=ibft</option> option
</entry>
</row>
<row>
@@ -971,7 +971,7 @@ Password:
<option>ksdevice=<replaceable>device</replaceable></option>
</entry>
<entry>
- Replaced by specifying the device name using the <option>ip=</option> <application>dracut</application> option.
+ Replaced by specifying the device name using the <option>ip=</option> option.
</entry>
</row>
</tbody>
@@ -1099,7 +1099,7 @@ Password:
<term><option>noipv6</option></term>
<listitem>
<para>
- Used to disable IPv6 support in the installation program. IPv6 is now built into the kernel so the driver cannot be blacklisted; however, it is possible to disable IPv6 using the <option>ipv6.disable</option> <application>dracut</application> option.
+ Used to disable IPv6 support in the installation program. IPv6 is now built into the kernel so the driver cannot be blacklisted; however, it is possible to disable IPv6 using the <option>ipv6.disable</option> option.
</para>
</listitem>
</varlistentry>
@@ -1115,7 +1115,7 @@ Password:
<term><option>vlanid=</option></term>
<listitem>
<para>
- Used to configure Virtual LAN (802.1q tag) devices. Use the <option>vlan=</option> <application>dracut</application> option instead.
+ Used to configure Virtual LAN (802.1q tag) devices. Use the <option>vlan=</option> option instead.
</para>
</listitem>
</varlistentry>
9 years, 7 months