From e37ff71f2cb8040e23cb7af96c0c31a4444a3b9c Mon Sep 17 00:00:00 2001 From: Darren 'Tadgy' Austin Date: Thu, 14 Nov 2019 06:30:20 +0000 Subject: Update text in rc.inet1.conf, and sync with netconfig. --- netconfig | 98 +++++++++++++++++++++++++++++++++++++++++------------------ rc.inet1.conf | 4 +-- 2 files changed, 70 insertions(+), 32 deletions(-) diff --git a/netconfig b/netconfig index 2a75ef1..69aae44 100644 --- a/netconfig +++ b/netconfig @@ -25,19 +25,19 @@ fi # /etc/rc.d/rc.inet1.conf # # This file contains the configuration settings for network interfaces. - +# # If USE_DHCP[interface] is set to "yes", this overrides any other settings. # If you don't have an interface, leave the settings null (""). - +# # You can configure network interfaces other than eth0,eth1... by setting # IFNAME[interface] to the interface's name. If IFNAME[interface] is unset # or empty, it is assumed you're configuring eth. - -# Several other parameters are available, the end of this file contains a +# +# Several other parameters are available; the end of this file contains a # comprehensive set of examples. - +# # Important note for IPv6 stateless auto configuration (SLAAC) users: -# From Slackware 15.0 onwards, you need to set USE_SLAAC[0]="yes" (etc) below +# From Slackware 15.0 onwards, you need to set USE_SLAAC[0]="yes" below. # ============================================================================= @@ -92,38 +92,66 @@ GATEWAY6="" # ============================================================================= -# Change this to "yes" for debugging output to stdout. -DEBUG_ETH_UP="no" - -# MAXNICS is the maximum number of interfaces that will be configured. -# You may need to increase the MAXNICS value if you have many interfaces, or -# you use multiple VLANs and/or bridges. The default is 6. -# MAXNICS="6" +# Example of how to configure a bond (link aggrigation) interface. +# Note the addition of the BONDNICS and BONDMODE parameters. +# BONDNICS is a space delimited list of interfaces to add to this bond. The +# interfaces will be brought up and configured while bringing up the interface, +# so do not need to be previously defined in rc.inet1.conf. +# BONDMODE sets the bonding mode for this interface. If not specified when +# BONDNICS has been used, the default is 'balance-rr'. +# The IFOPTS[x] option should always include the 'miimon' option when +# configuring bonding - not using this option will result in network +# degradation. In 'active-backup' mode, the 'primary' option should also be +# supplied. When using '802.3ad mode', set "lacp_rate fast" for faster +# recovery from an interface failure. In other modes, the 'xmit_hash_policy' +# should be set. +#IFNAME[0]="bond0" +#BONDNICS[0]="eth0 eth1" +#BONDMODE[0]="balance-rr" +#IFOPTS[0]="xmit_hash_policy layer2+3 | miimon 100" +#IPADDR[0]="192.168.0.1" +#NETMASK[0]="24" +#IPALIASES[0]="" +#USE_DHCP[0]="" +#DHCP_HOSTNAME[0]="" +#IP6ADDRS[0]="" +#USE_SLAAC[0]="" +#USE_DHCP6[0]="" # ============================================================================= -# Example of how to configure a VLAN interface. +# Example of how to configure a VLAN interface: # The VLAN ID is taken from the full interface name, which is comprised of the # underlying interface name, a period (.) and then the VLAN ID. -# IFNAME[0]="eth0.10" -# IPADDR[0]="192.168.10.1" -# NETMASK[0]="24" -# IPALIASES[0]="" -# USE_DHCP[0]="" -# DHCP_HOSTNAME[0]="" -# IP6ADDRS[0]="" -# USE_SLAAC[0]="" -# USE_DHCP6[0]="" +# IFOPTS is a pipe (|) delimited list of VLAN module specific settings to be +# applied to the interface. See the ip-link(8) man page (search for "VLAN Type +# Support") for details of the options available. This option is not required +# for a standard VLAN to be configured. +#IFNAME[0]="eth0.10" +#IFOPTS[0]="" +#IPADDR[0]="192.168.10.1" +#NETMASK[0]="24" +#IPALIASES[0]="" +#USE_DHCP[0]="" +#DHCP_HOSTNAME[0]="" +#IP6ADDRS[0]="" +#USE_SLAAC[0]="" +#USE_DHCP6[0]="" # ============================================================================= # Example of how to configure a bridge: # Note the added "BRNICS" variable which contains a space-separated list # of the physical or virtual network interfaces you want to add to the bridge. +# IFOPTS is a pipe (|) delimited list of bridge module specific settings to be +# applied to the interface. See the ip-link(8) man page (search for "BRIDGE +# Type Support") for details of the options available. This option is not +# required for a standard bridge to be configured. #IFNAME[0]="br0" #BRNICS[0]="eth0" +#IFOPTS[0]="" #IPADDR[0]="192.168.0.1" -#NETMASK[0]="255.255.255.0" +#NETMASK[0]="24" #IPALIASES[0]="" #USE_DHCP[0]="" #DHCP_HOSTNAME[0]="" @@ -136,13 +164,12 @@ DEBUG_ETH_UP="no" # adjust VIRTIFNAME and VIRTIFTYPE accordingly. # Starting with VIRTIFNAME[0] is mandatory, and each next one must be # incremented by one, so VIRTIFNAME[1], VIRTIFNAME[2], and so on. -# # Virtual tap interface example #VIRTIFNAME[0]="tap0" #VIRTIFTYPE[0]="tap" #VIRTIFUSER[0]="root" #VIRTIFGROUP[0]="root" -# + # Virtual tun interface example #VIRTIFNAME[1]="tun0" #VIRTIFTYPE[1]="tun" @@ -151,8 +178,9 @@ DEBUG_ETH_UP="no" # ============================================================================= -## Example config information for wlan0. Uncomment the lines you need and fill -## in your data. (You may not need all of these for your wireless network) +# Example config information for wlan0: +# Uncomment the lines you need and fill in your data. You may not need all of +# these for your wireless network. #IFNAME[4]="wlan0" #IPADDR[4]="" #NETMASK[4]="" @@ -172,10 +200,10 @@ DEBUG_ETH_UP="no" #WLAN_WPADRIVER[4]="wext" #WLAN_WPAWAIT[4]=30 + # ============================================================================= -## Some examples of additional network parameters that you can use. -## Config information for wlan0: +# Some examples of additional network parameters that you can use. #IFNAME[4]="wlan0" # Use a different interface name instead of # the default 'eth4' #IPALIASES[4]="192.168.5.10/24" # Set up an IP alias. A netmask may be given @@ -221,6 +249,16 @@ DEBUG_ETH_UP="no" #WLAN_WPAWAIT[4]=30 # In case it takes long for the WPA association # to finish, you can increase the wait time # (defaults to 10 seconds) + +# ============================================================================= + +# Change this to "yes" for debugging output to stdout. +DEBUG_ETH_UP="no" + +# MAXNICS is the maximum number of interfaces that will be configured. +# You may need to increase the MAXNICS value if you have many interfaces, or +# you use multiple VLANs and/or bridges. The default is 6. +# MAXNICS="6" ENDFILE # ############################################################################ diff --git a/rc.inet1.conf b/rc.inet1.conf index af8a091..5969655 100644 --- a/rc.inet1.conf +++ b/rc.inet1.conf @@ -99,7 +99,7 @@ GATEWAY6="" # Example of how to configure a VLAN interface: # The VLAN ID is taken from the full interface name, which is comprised of the # underlying interface name, a period (.) and then the VLAN ID. -# VLANOPTS is a pipe (|) delimited list of VLAN module specific settings to be +# IFOPTS is a pipe (|) delimited list of VLAN module specific settings to be # applied to the interface. See the ip-link(8) man page (search for "VLAN Type # Support") for details of the options available. This option is not required # for a standard VLAN to be configured. @@ -119,7 +119,7 @@ GATEWAY6="" # Example of how to configure a bridge: # Note the added "BRNICS" variable which contains a space-separated list # of the physical or virtual network interfaces you want to add to the bridge. -# BROPTS is a pipe (|) delimited list of bridge module specific settings to be +# IFOPTS is a pipe (|) delimited list of bridge module specific settings to be # applied to the interface. See the ip-link(8) man page (search for "BRIDGE # Type Support") for details of the options available. This option is not # required for a standard bridge to be configured. -- cgit v1.2.3