Mon Mar 1 20:10:44 UTC 202120210301201044

a/e2fsprogs-1.46.2-x86_64-1.txz:  Upgraded.
a/etc-15.0-x86_64-14.txz:  Rebuilt.
  /etc/hosts: added IPv6 loopback addresses.
a/hwdata-0.345-noarch-1.txz:  Upgraded.
ap/hplip-3.20.6-x86_64-7.txz:  Rebuilt.
  Fixed desktop file to show category and icon properly.
  Thanks to upnort and ArTourter.
d/git-2.30.1-x86_64-3.txz:  Rebuilt.
  Make sure the bash-completion file is installed in the proper location.
  Thanks to Robby Workman.
d/python-setuptools-54.0.0-x86_64-1.txz:  Upgraded.
d/vala-0.50.4-x86_64-1.txz:  Upgraded.
l/imagemagick-7.0.11_2-x86_64-1.txz:  Upgraded.
l/python-pillow-8.1.1-x86_64-1.txz:  Upgraded.
n/network-scripts-15.0-noarch-13.txz:  Rebuilt.
  Well, apparently there was a newer branch of this than the one that was
  sitting in my usual pending queue, so here it is. This also includes some
  additional documentation on the new features. NOTE: In order to use SLAAC
  to configure IPv6, you'll need to have USE_SLAAC[x]="yes" for the interface
  in rc.inet1.conf. This is to ensure that nobody is surprised to find their
  machine fully exposed to the internet - better safe than sorry.
  Thanks to Darren "Tadgy" Austin and Robby Workman.
n/wireless_tools-30.pre9-x86_64-4.txz:  Rebuilt.
  This package contains some updates to rc.wireless and rc.wireless.conf.
  Thanks to Darren "Tadgy" Austin.
xfce/mousepad-0.5.3-x86_64-1.txz:  Upgraded.

1 files changed, 27 insertions, 40 deletions

diff --git a/source/n/network-scripts/scripts/rc.inet1.conf b/source/n/network-scripts/scripts/rc.inet1.conf
index 5081ee5bb..0daee7017 100644
--- a/source/n/network-scripts/scripts/rc.inet1.conf
+++ b/source/n/network-scripts/scripts/rc.inet1.conf
@@ -17,49 +17,45 @@
 
 # =============================================================================
 
-# IPv4 config information for eth0:
-IPADDR[0]=""
-NETMASK[0]=""
-IPALIASES[0]=""
+# IPv4 config options for eth0:
+IPADDRS[0]=""
 USE_DHCP[0]=""
-DHCP_HOSTNAME[0]=""
-# IPv6 config information for eth0:
+# IPv6 config options for eth0:
 IP6ADDRS[0]=""
 USE_SLAAC[0]=""
 USE_DHCP6[0]=""
+# Generic options for eth0:
+DHCP_HOSTNAME[0]=""
 
-# IPv4 config information for eth1:
-IPADDR[1]=""
-NETMASK[1]=""
-IPALIASES[1]=""
+# IPv4 config options for eth1:
+IPADDRS[1]=""
 USE_DHCP[1]=""
-DHCP_HOSTNAME[1]=""
-# IPv6 config information for eth1:
+# IPv6 config options for eth1:
 IP6ADDRS[1]=""
 USE_SLAAC[1]=""
 USE_DHCP6[1]=""
+# Generic options for eth1:
+DHCP_HOSTNAME[1]=""
 
-# IPv4 config information for eth2:
-IPADDR[2]=""
-NETMASK[2]=""
-IPALIASES[2]=""
+# IPv4 config options for eth2:
+IPADDRS[2]=""
 USE_DHCP[2]=""
-DHCP_HOSTNAME[2]=""
-# IPv6 config information for eth2:
+# IPv6 config options for eth2:
 IP6ADDRS[2]=""
 USE_SLAAC[2]=""
 USE_DHCP6[2]=""
+# Generic options for eth2:
+DHCP_HOSTNAME[2]=""
 
-# IPv4 config information for eth3:
-IPADDR[3]=""
-NETMASK[3]=""
-IPALIASES[3]=""
+# IPv4 config options for eth3:
+IPADDRS[3]=""
 USE_DHCP[3]=""
-DHCP_HOSTNAME[3]=""
-# IPv6 config information for eth3:
+# IPv6 config options for eth3:
 IP6ADDRS[3]=""
 USE_SLAAC[3]=""
 USE_DHCP6[3]=""
+# Generic options for eth3:
+DHCP_HOSTNAME[3]=""
 
 # IPv4 default gateway IP address:
 GATEWAY=""
@@ -68,7 +64,7 @@ GATEWAY6=""
 
 # =============================================================================
 
-# Example of how to configure a bond (link aggrigation) interface.
+# Example of how to configure a bond (link aggregation) interface.
 # Note the addition of the BONDNICS and BONDMODE parameters.
 # 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
@@ -107,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]=""
@@ -128,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]=""
 
@@ -160,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"
@@ -188,15 +179,11 @@ 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 /<prefix> 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.
 #PROMISCUOUS[4]="yes"           # Set promiscuous mode on the interface.
-#DHCP_TIMEOUT[4]=15             # The default timeout for the DHCP client to
+#DHCP_TIMEOUT[4]="15"           # The default timeout for the DHCP client to
                                 # wait for server resonse is 15 seconds, but
                                 # you might want a shorter or longer wait.
 #DHCP_KEEPRESOLV[4]="yes"       # If you don't want /etc/resolv.conf overwritten
@@ -215,7 +202,7 @@ GATEWAY6=""
                                 # Increase the timeout if required.
 #USE_RA[4]="yes"                # Accept router advertisements even when SLAAC
                                 # is disabled on the interface.
-#WLAN_ESSID[4]=DARKSTAR         # An example of how you can override _any_
+#WLAN_ESSID[4]="DARKSTAR"       # An example of how you can override _any_
                                 # parameter defined in rc.wireless.conf, by
                                 # prepending 'WLAN_' to the parameter's name.
                                 # Useful with multiple wireless interfaces.
@@ -229,7 +216,7 @@ GATEWAY6=""
 #WLAN_WPADRIVER[4]="ndiswrapper"# Tell wpa_supplicant to specifically use the
                                 # ndiswrapper driver (if you leave this empty
                                 # the 'wext' driver is used by default)
-#WLAN_WPAWAIT[4]=30             # In case it takes long for the WPA association
+#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)