Repository :
http://git.fedorahosted.org/cgit/docs/networking-guide.git
On branch : master
---------------------------------------------------------------
commit cd2952b6f932d1e27602f6ad6de5f7c8d3d804b2
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Fri Apr 10 17:00:59 2015 +0200
Remove NM_CONTROLLED
It should no longer be required
---------------------------------------------------------------
en-US/Configure_Network_Bridging.xml | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/en-US/Configure_Network_Bridging.xml b/en-US/Configure_Network_Bridging.xml
index 1ffccdc..4599718 100644
--- a/en-US/Configure_Network_Bridging.xml
+++ b/en-US/Configure_Network_Bridging.xml
@@ -290,9 +290,6 @@ See the <filename>modprobe(8)</filename> man page for more
command options.
An extra directive, <option>DELAY=0</option>, is added to prevent the
bridge from waiting while it monitors traffic, learns where hosts are located, and builds
a table of MAC addresses on which to base its filtering decisions. The default delay of 30
seconds is not needed if no routing loops are possible.
</para>
</listitem>
- <listitem><para>
- The <option>NM_CONTROLLED=no</option> should be added to the Ethernet
interface to prevent <application>NetworkManager</application> from altering
the file. It can also be added to the bridge configuration file.</para>
- </listitem>
</itemizedlist>
</para>
<para>
@@ -306,7 +303,6 @@ IPADDR=192.168.1.1
PREFIX=24
ONBOOT=yes
BOOTPROTO=none
-NM_CONTROLLED=no
DELAY=0</programlisting>
</example>
<para>To complete the bridge another interface is created, or an existing
interface is modified, and pointed to the bridge interface. The following is a sample
Ethernet interface configuration file pointing to a bridge interface. Configure your
physical interface in
<filename>/etc/sysconfig/network-scripts/ifcfg-eth<replaceable>X</replaceable></filename>,
where <replaceable>X</replaceable> is a unique number corresponding to a
specific interface, as follows:</para>
@@ -317,7 +313,6 @@ TYPE=Ethernet
HWADDR=AA:BB:CC:DD:EE:FF
BOOTPROTO=none
ONBOOT=yes
-NM_CONTROLLED=no
BRIDGE=br0</programlisting>
</example>
<note>
@@ -348,8 +343,7 @@ TYPE=Ethernet
SLAVE=yes
MASTER=bond0
BOOTPROTO=none
-HWADDR=AA:BB:CC:DD:EE:FF
-NM_CONTROLLED=no</programlisting>
+HWADDR=AA:BB:CC:DD:EE:FF</programlisting>
</para>
<note>
<para>
@@ -361,9 +355,8 @@ NM_CONTROLLED=no</programlisting>
<programlisting>DEVICE=bond0
ONBOOT=yes
BONDING_OPTS='mode=1 miimon=100'
-BRIDGE=brbond0
-NM_CONTROLLED=no</programlisting>
<!--For further instructions and advice on configuring the bonding module and to
view the list of bonding parameters, see the <citetitle
pubwork="book">&MAJOROSVER; System Administrator's Reference
Guide</citetitle>.-->
+BRIDGE=brbond0</programlisting>
</para>
<para>
Create or edit one interface configuration file,
<filename>/etc/sysconfig/network-scripts/ifcfg-brbond0</filename>, as
follows:
@@ -371,8 +364,7 @@ NM_CONTROLLED=no</programlisting>
ONBOOT=yes
TYPE=Bridge
IPADDR=192.168.1.1
-PREFIX=24
-NM_CONTROLLED=no</programlisting>
+PREFIX=24</programlisting>
</para>
<para>We now have two or more interface configuration files with the
<option>MASTER=bond0</option> directive. These point to the configuration file
named <filename>/etc/sysconfig/network-scripts/ifcfg-bond0</filename>, which
contains the <option>DEVICE=bond0</option> directive. This
<filename>ifcfg-bond0</filename> in turn points to the
<filename>/etc/sysconfig/network-scripts/ifcfg-brbond0</filename>
configuration file, which contains the <systemitem
class="protocol">IP</systemitem> address, and acts as an interface to
the virtual networks inside the host.</para>