Merge branch 'master' of https://projects.archlinux.org/git/initscripts2011.06.1

Conflicts:
	functions

1 files changed, 27 insertions, 32 deletions

diff --git a/rc.conf b/rc.conf
index 1898aa3..18effe9 100644
--- a/rc.conf
+++ b/rc.conf
@@ -33,8 +33,12 @@ VERBOSE="3"
 # HARDWARE
 # -----------------------------------------------------------------------
 #
-# MOD_AUTOLOAD: Allow autoloading of modules at boot and when needed
-# MODULES: Modules to load at boot-up. Prefix with a ! to blacklist.
+# MOD_AUTOLOAD: Deprecated. Always leave at "yes".
+# MODULES: Modules to load at boot-up. Blacklisting is no longer supported.
+#   Replace every !module by an entry as on the following line in a file in
+#   /etc/modprobe.d:
+#     blacklist module
+#   See "man modprobe.conf" for details.
 #
 MOD_AUTOLOAD="yes"
 MODULES=()
@@ -59,44 +63,35 @@ USELVM="no"
 #
 HOSTNAME="myhost"
 
-# Use 'ifconfig -a' or 'ls /sys/class/net/' to see all available interfaces.
+# Use 'ip addr' or 'ls /sys/class/net/' to see all available interfaces.
 #
-# Interfaces to start at boot-up (in this order)
-# Declare each interface then list in INTERFACES
-#   - prefix an entry in INTERFACES with a ! to disable it
-#   - no hyphens in your interface names - Bash doesn't like it
+# Wired network setup
+#   - interface: name of device (required)
+#   - address: IP address (leave blank for DHCP)
+#   - netmask: subnet mask (ignored for DHCP)
+#   - gateway: default route (ignored for DHCP)
 # 
-# DHCP:     Set your interface to "dhcp" (eth0="dhcp")
-# Wireless: See network profiles below
-#
-
-#Static IP example
-#eth0="eth0 192.168.0.2 netmask 255.255.255.0 broadcast 192.168.0.255"
-eth0="dhcp"
-INTERFACES=(eth0)
+# Static IP example
+# interface=eth0
+# address=192.168.0.2
+# netmask=255.255.255.0
+# gateway=192.168.0.1
+#
+# DHCP example
+# interface=eth0
+# address=
+# netmask=
+# gateway=
 
-# Routes to start at boot-up (in this order)
-# Declare each route then list in ROUTES
-#   - prefix an entry in ROUTES with a ! to disable it
-#
-gateway="default gw 192.168.0.1"
-ROUTES=(!gateway)
+interface=
+address=
+netmask=
+gateway=
 
 # Setting this to "yes" will skip network shutdown.
 # This is required if your root device is on NFS.
 NETWORK_PERSIST="no"
 
-# Enable these network profiles at boot-up.  These are only useful
-# if you happen to need multiple network configurations (ie, laptop users)
-#   - set to 'menu' to present a menu during boot-up (dialog package required)
-#   - prefix an entry with a ! to disable it
-#
-# Network profiles are found in /etc/network.d
-#
-# This now requires the netcfg package
-#
-#NETWORKS=(main)
-
 # -----------------------------------------------------------------------
 # DAEMONS
 # -----------------------------------------------------------------------