summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren 'Tadgy' Austin <darren@afterdark.org.uk>2021-03-02 12:18:52 +0000
committerDarren 'Tadgy' Austin <darren@afterdark.org.uk>2021-03-02 12:18:52 +0000
commit9e3c7cdd9fbf73dfbc41bb4e213dc33674567076 (patch)
treee4bb1bcb69cc8a3914f9a3999e1070a0786393f8
parent7224c8b4e6dd8238a726a874edbb7f4336f9b64e (diff)
downloadslacknetsetup-9e3c7cdd9fbf73dfbc41bb4e213dc33674567076.tar.xz
Fix descrepencies between rc.inet1.conf versions.
-rw-r--r--netconfig1
-rw-r--r--rc.inet1.conf8
2 files changed, 4 insertions, 5 deletions
diff --git a/netconfig b/netconfig
index 69c6d6e..56b8593 100644
--- a/netconfig
+++ b/netconfig
@@ -185,6 +185,7 @@ GATEWAY6="$GATEWAY6"
# these for your wireless network.
#IFNAME[4]="wlan0"
#IPADDRS[4]=""
+#USE_DHCP[4]="yes"
#DHCP_HOSTNAME[4]="icculus-wireless"
#DHCP_KEEPRESOLV[4]="yes"
#DHCP_KEEPNTP[4]="yes"
diff --git a/rc.inet1.conf b/rc.inet1.conf
index 0daee70..26ef87e 100644
--- a/rc.inet1.conf
+++ b/rc.inet1.conf
@@ -69,7 +69,7 @@ GATEWAY6=""
# BONDNICS is a space delimited list of interfaces to add to this bond. The
# BONDNICS interfaces will be brought up and configured while bringing up the
# bond 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
+# BONDMODE sets the bonding mode for this interface. If not specified when
# BONDNICS has been used, the default is 'balance-rr'.
# IFOPTS is a pipe (|) delimited list of bonding module specific settings to be
# applied to the interface, and should always include the 'miimon' option when
@@ -83,9 +83,7 @@ GATEWAY6=""
#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]=""
+#IPADDRS[0]="192.168.0.1/24"
#USE_DHCP[0]=""
#DHCP_HOSTNAME[0]=""
#IP6ADDRS[0]=""
@@ -174,7 +172,7 @@ GATEWAY6=""
# Some examples of additional network parameters that you can use.
#IFNAME[4]="wlan0" # Use a different interface name instead of
# the default 'eth4'
-#IFOPTS[4]="" # A pipe (|) delimited list of interface type
+#IFOPTS[4]="" # A pipe (|) delimited list of interface type
# specific options to apply. These options
# can be found in the ip-link(8) man page in
# the approprite section for the interface