mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

man: fix merge errors

Browse Source 
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
This commit is contained in:
Roopa Prabhu
2016-06-21 10:28:09 -07:00
parent 4dff01cd4e
commit 13201c83ca
5 changed files with 12 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
man.rst/ifquery.8.rst
View File

@@ -33,12 +33,8 @@ DESCRIPTION
**ifquery** always works on the current **interfaces(5)** file
**/etc/network/interfaces** unless an alternate interfaces file is
<<<<<<< HEAD
provided with the **-i** option.
=======
defined in ifupdown2.conf or provided with the **-i** option.
Note: the -i option is disabled by default in ifupdown2.conf.
>>>>>>> cumulus/dev
OPTIONS
=======
@@ -65,12 +61,6 @@ OPTIONS
-X EXCLUDEPATS, --exclude EXCLUDEPATS
Exclude interfaces from the list of interfaces to
operate on. Can be specified multiple times
<<<<<<< HEAD
-i INTERFACESFILE, --interfaces INTERFACESFILE
Use interfaces file instead of default
/etc/network/interfaces
=======
If the excluded interface has dependent interfaces,
(e.g. a bridge or a bond with multiple enslaved interfaces)
then each dependent interface must be specified in order
@@ -79,7 +69,6 @@ OPTIONS
-i INTERFACESFILE, --interfaces INTERFACESFILE
Use interfaces file instead of default
defined in ifupdown2.conf (default /etc/network/interfaces)
>>>>>>> cumulus/dev
-t {native,json}, --interfaces-format {native,json}
interfaces file format

11
man.rst/ifreload.8.rst
View File

@@ -14,20 +14,12 @@ reload network interface configuration
SYNOPSIS
========
<<<<<<< HEAD
ifreload [-h] (-a|-c) [-v] [-d] [-f] [-n]
DESCRIPTION
===========
reloads network **interfaces(5)** file **/etc/network/interfaces**.
=======
ifreload [-h] (-a|-c) [-v] [-d] [-f] [-n] [-s]
DESCRIPTION
===========
reloads network **interfaces(5)** file **/etc/network/interfaces**
or config file defined in ifupdown2.conf file.
>>>>>>> cumulus/dev
Runs **ifdown** on interfaces that were removed from the file and
subsequently runs **ifup** on all interfaces.
@@ -64,15 +56,12 @@ OPTIONS
-X EXCLUDEPATS, --exclude EXCLUDEPATS
Exclude interfaces from the list of interfaces to
operate on. Can be specified multiple times
<<<<<<< HEAD
=======
If the excluded interface has dependent interfaces,
(e.g. a bridge or a bond with multiple enslaved interfaces)
then each dependent interface must be specified in order
to be excluded.
-s, --syntax-check Only run the interfaces file parser
>>>>>>> cumulus/dev
EXAMPLES

23
man.rst/ifup.8.rst
View File

@@ -22,11 +22,7 @@ SYNOPSIS
========
ifup [-h] [-a] [-v] [-d] [--allow CLASS] [--with-depends]
<<<<<<< HEAD
**[-X EXCLUDEPATS] [-f] [-n] [--print-dependency {list,dot}]**
=======
**[-X EXCLUDEPATS] [-f] [-n] [-s] [--print-dependency {list,dot}]**
>>>>>>> cumulus/dev
**[IFACE [IFACE ...]]**
ifdown [-h] [-a] [-v] [-d] [--allow CLASS] [--with-depends]
@@ -37,22 +33,13 @@ DESCRIPTION
===========
**ifup** and **ifdown** commands can be used to configure (or, respectively,
deconfigure) network interfaces based on interface definitions in the
<<<<<<< HEAD
file **/etc/network/interfaces/** file.
=======
config file ifupdown2.conf (defaults to **/etc/network/interfaces/** file).
>>>>>>> cumulus/dev
**ifquery(8)** maybe used in conjunction with **ifup** and **ifdown**
commands to query and validate applied/running configuration.
<<<<<<< HEAD
**ifup** always works on the current **interfaces(5)** file under
**/etc/network/interfaces**. **ifdown** works on the last applied interface
=======
**ifup** always works on the current **interfaces(5)** file defined in ifupdown2.conf
(default **/etc/network/interfaces**). **ifdown** works on the last applied interface
>>>>>>> cumulus/dev
configuration.
**ifup** on an already ifup'ed interface will re-apply the configuration,
@@ -95,12 +82,6 @@ OPTIONS
-X EXCLUDEPATS, --exclude EXCLUDEPATS
Exclude interfaces from the list of interfaces to
operate on. Can be specified multiple times
<<<<<<< HEAD
-i INTERFACESFILE, --interfaces INTERFACESFILE
Use interfaces file instead of default
/etc/network/interfaces
=======
If the excluded interface has dependent interfaces,
(e.g. a bridge or a bond with multiple enslaved interfaces)
then each dependent interface must be specified in order
@@ -112,7 +93,6 @@ OPTIONS
Also in ifupdown2.conf, users are not allowed to specify their own
interfaces file unless disable_cli_interfacesfile is set to 0
(default is 1).
>>>>>>> cumulus/dev
-t {native,json}, --interfaces-format {native,json}
interfaces file format
@@ -135,11 +115,8 @@ OPTIONS
your state file is corrupted or you want down to use
the latest from the interfaces file
<<<<<<< HEAD
=======
-s, --syntax-check Only run the interfaces file parser
>>>>>>> cumulus/dev
EXAMPLES
========
# bringing up all interfaces

92
man.rst/ifupdown-addons-interfaces.5.rst
View File

@@ -58,21 +58,12 @@ EXAMPLES
**required**: False
<<<<<<< HEAD
**default**: off
**validvals**: on,off
**example**:
link-autoneg on
=======
**default**: no
**validvals**: yes,no
**example**:
link-autoneg yes
>>>>>>> cumulus/dev
**link-speed**
@@ -191,19 +182,10 @@ EXAMPLES
**required**: False
<<<<<<< HEAD
**default**: 0
**example**:
bridge-mcquerier 0
=======
**default**: no
**validvals**: yes,no
**example**:
bridge-mcquerier no
>>>>>>> cumulus/dev
**bridge-mclmc**
@@ -239,19 +221,10 @@ EXAMPLES
**required**: False
<<<<<<< HEAD
**default**: 1
**example**:
bridge-mcrouter 1
=======
**default**: yes
**validvals**: yes,no
**example**:
bridge-mcrouter yes
>>>>>>> cumulus/dev
**bridge-stp**
@@ -348,11 +321,8 @@ EXAMPLES
bridge-ports glob swp1-3.100
<<<<<<< HEAD
=======
bridge-ports glob swp[1-3]s[0-4].100
>>>>>>> cumulus/dev
bridge-ports regex (swp[1|2|3].100)
@@ -363,19 +333,10 @@ EXAMPLES
**required**: False
<<<<<<< HEAD
**default**: 0
**example**:
bridge-mcqifaddr 0
=======
**default**: no
**validvals**: yes,no
**example**:
bridge-mcqifaddr no
>>>>>>> cumulus/dev
**bridge-waitport**
@@ -480,19 +441,10 @@ EXAMPLES
**required**: False
<<<<<<< HEAD
**default**: 1
**example**:
bridge-mcsnoop 1
=======
**default**: yes
**validvals**: yes,no
**example**:
bridge-mcsnoop yes
>>>>>>> cumulus/dev
**bridge-access**
@@ -1016,11 +968,7 @@ EXAMPLES
<<<<<<< HEAD
**ifenslave**: bond configuration module
=======
**bond**: bond configuration module
>>>>>>> cumulus/dev
**bond-use-carrier**
@@ -1030,21 +978,12 @@ EXAMPLES
**required**: False
<<<<<<< HEAD
**default**: 1
**validvals**: 0,1
**example**:
bond-use-carrier 1
=======
**default**: yes
**validvals**: yes,no
**example**:
bond-use-carrier yes
>>>>>>> cumulus/dev
**bond-lacp-bypass-period**
@@ -1138,21 +1077,27 @@ EXAMPLES
**required**: False
<<<<<<< HEAD
**default**: 0
**validvals**: 0,1
**example**:
bond-lacp-bypass-allow 0
=======
**default**: no
**validvals**: yes,no
**bond-lacp-bypass-allow-all-active**
**help**: allow all slaves to be active in lacp bypass irrespective of priority
**required**: False
**default**: 0
**validvals**: 0,1
**example**:
bond-lacp-bypass-allow no
>>>>>>> cumulus/dev
bond-lacp-bypass-all-active 1
**bond-mode**
@@ -1378,28 +1323,15 @@ EXAMPLES
**vxlan-learning**
<<<<<<< HEAD
**help**: vxlan learning on/off
=======
**help**: vxlan learning yes/no
>>>>>>> cumulus/dev
**required**: False
<<<<<<< HEAD
**default**: on
**example**:
vxlan-learning off
=======
**default**: yes
**validvals**: yes,no
**example**:
vxlan-learning no
>>>>>>> cumulus/dev
**vxlan-id**

9
man.rst/interfaces.5.rst
View File

@@ -14,14 +14,9 @@ network interface configuration for ifupdown
DESCRIPTION
===========
<<<<<<< HEAD
**/etc/network/interfaces** contains network interface configuration
information for the **ifup(8)**, **ifdown(8)** and **ifquery(8)** commands.
=======
By default, ifupdown2.conf sets **/etc/network/interfaces** as the
network interface configuration file. This file contains information
for the **ifup(8)**, **ifdown(8)** and **ifquery(8)** commands.
>>>>>>> cumulus/dev
This is where you configure how your system is connected to the network.
@@ -151,11 +146,7 @@ EXAMPLES
FILES
=====
<<<<<<< HEAD
/etc/network/interfaces
=======
configuration file defined in ifupdown2.conf (default /etc/network/interfaces)
>>>>>>> cumulus/dev
SEE ALSO
========