From a7e23ae08a4ed8f20266a898d3259470be5dfc2c Mon Sep 17 00:00:00 2001 From: Darren 'Tadgy' Austin Date: Mon, 30 Nov 2020 12:50:52 +0000 Subject: Change final occurances of IPADDR/NETMASK/IPALIASES over to IPADDRS. --- netconfig | 20 ++++---------------- rc.inet1.conf | 15 +++------------ 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/netconfig b/netconfig index 4d8fbc9..a41eb49 100644 --- a/netconfig +++ b/netconfig @@ -117,9 +117,7 @@ GATEWAY6="$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]="" @@ -137,9 +135,7 @@ GATEWAY6="$GATEWAY6" # for a standard VLAN to be configured. #IFNAME[0]="eth0.10" #IFOPTS[0]="" -#IPADDR[0]="192.168.10.1" -#NETMASK[0]="24" -#IPALIASES[0]="" +#IPADDRS[0]="192.168.10.1/24" #USE_DHCP[0]="" #DHCP_HOSTNAME[0]="" #IP6ADDRS[0]="" @@ -158,9 +154,7 @@ GATEWAY6="$GATEWAY6" #IFNAME[0]="br0" #BRNICS[0]="eth0" #IFOPTS[0]="" -#IPADDR[0]="192.168.0.1" -#NETMASK[0]="24" -#IPALIASES[0]="" +#IPADDRS[0]="192.168.0.1/24" #USE_DHCP[0]="" #DHCP_HOSTNAME[0]="" @@ -190,9 +184,7 @@ GATEWAY6="$GATEWAY6" # 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]="" -#USE_DHCP[4]="yes" +#IPADDRS[4]="" #DHCP_HOSTNAME[4]="icculus-wireless" #DHCP_KEEPRESOLV[4]="yes" #DHCP_KEEPNTP[4]="yes" @@ -218,10 +210,6 @@ GATEWAY6="$GATEWAY6" # can be found in the ip-link(8) man page in # the approprite section for the interface # type being configured. -#IPALIASES[4]="192.168.5.10/24" # A space delimited list of CIDR formatted IP - # aliases to assign to the interface after it - # has come up. If no / is given after - # the IP address, /24 will be used as default. #HWADDR[4]="00:01:23:45:67:89" # Overrule the card's hardware MAC address #MTU[4]="" # The default MTU is 1500, but you might need # 1360 when you use NAT'ed IPSec traffic. diff --git a/rc.inet1.conf b/rc.inet1.conf index 5def0a8..4935f68 100644 --- a/rc.inet1.conf +++ b/rc.inet1.conf @@ -103,9 +103,7 @@ GATEWAY6="" # for a standard VLAN to be configured. #IFNAME[0]="eth0.10" #IFOPTS[0]="" -#IPADDR[0]="192.168.10.1" -#NETMASK[0]="24" -#IPALIASES[0]="" +#IPADDRS[0]="192.168.10.1/24" #USE_DHCP[0]="" #DHCP_HOSTNAME[0]="" #IP6ADDRS[0]="" @@ -124,9 +122,7 @@ GATEWAY6="" #IFNAME[0]="br0" #BRNICS[0]="eth0" #IFOPTS[0]="" -#IPADDR[0]="192.168.0.1" -#NETMASK[0]="24" -#IPALIASES[0]="" +#IPADDRS[0]="192.168.0.1/24" #USE_DHCP[0]="" #DHCP_HOSTNAME[0]="" @@ -156,8 +152,7 @@ GATEWAY6="" # 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]="" +#IPADDRS[4]="" #USE_DHCP[4]="yes" #DHCP_HOSTNAME[4]="icculus-wireless" #DHCP_KEEPRESOLV[4]="yes" @@ -184,10 +179,6 @@ GATEWAY6="" # can be found in the ip-link(8) man page in # the approprite section for the interface # type being configured. -#IPALIASES[4]="192.168.5.10/24" # A space delimited list of CIDR formatted IP - # aliases to assign to the interface after it - # has come up. If no / is given after - # the IP address, /24 will be used as default. #HWADDR[4]="00:01:23:45:67:89" # Overrule the card's hardware MAC address #MTU[4]="" # The default MTU is 1500, but you might need # 1360 when you use NAT'ed IPSec traffic. -- cgit v1.2.3