[networking-guide] master: There is no USERCTL in Fedora 20 (20bf61b)

stephenw at fedoraproject.org stephenw at fedoraproject.org
Wed Sep 3 19:57:07 UTC 2014


Repository : http://git.fedorahosted.org/cgit/docs/networking-guide.git

On branch  : master

>---------------------------------------------------------------

commit 20bf61b9d15865fcfb72bc625dc6896bb4b9d4f7
Author: Stephen Wadeley <swadeley at 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>



More information about the docs-commits mailing list