From 7978075fa644e5de43d6ea3433b40549a31fe342 Mon Sep 17 00:00:00 2001
From: Christian Heim <phreak@gentoo.org>
Date: Fri, 7 Apr 2006 11:56:04 +0000
Subject: Merging r1959

svn path=/baselayout-vserver/trunk/; revision=313
---
 ChangeLog                                   |  50 ++
 ChangeLog.vserver                           |  46 ++
 bin/rc-status                               |   7 +-
 etc/conf.d/domainname                       |  20 -
 init.d/bootmisc                             |   6 -
 init.d/domainname                           |  63 --
 init.d/hostname                             |  34 +-
 net-scripts/conf.d/net.example              |   8 +-
 net-scripts/init.d/net.lo                   | 287 ++++++---
 net-scripts/net.modules.d/adsl              |  93 ---
 net-scripts/net.modules.d/adsl.sh           |  93 +++
 net-scripts/net.modules.d/apipa             |  46 --
 net-scripts/net.modules.d/apipa.sh          |  46 ++
 net-scripts/net.modules.d/arping            | 109 ----
 net-scripts/net.modules.d/arping.sh         | 109 ++++
 net-scripts/net.modules.d/bonding           | 120 ----
 net-scripts/net.modules.d/bonding.sh        | 120 ++++
 net-scripts/net.modules.d/bridge            | 198 ------
 net-scripts/net.modules.d/bridge.sh         | 198 ++++++
 net-scripts/net.modules.d/dhclient          | 150 -----
 net-scripts/net.modules.d/dhclient.sh       | 150 +++++
 net-scripts/net.modules.d/dhcpcd            | 123 ----
 net-scripts/net.modules.d/dhcpcd.sh         | 123 ++++
 net-scripts/net.modules.d/essidnet          |  49 --
 net-scripts/net.modules.d/essidnet.sh       |  49 ++
 net-scripts/net.modules.d/ifconfig          | 453 -------------
 net-scripts/net.modules.d/ifconfig.sh       | 453 +++++++++++++
 net-scripts/net.modules.d/ifplugd           | 146 -----
 net-scripts/net.modules.d/ifplugd.sh        | 146 +++++
 net-scripts/net.modules.d/ip6to4            |  97 ---
 net-scripts/net.modules.d/ip6to4.sh         |  97 +++
 net-scripts/net.modules.d/ipppd             |  72 ---
 net-scripts/net.modules.d/ipppd.sh          |  72 +++
 net-scripts/net.modules.d/iproute2          | 392 ------------
 net-scripts/net.modules.d/iproute2.sh       | 392 ++++++++++++
 net-scripts/net.modules.d/iptunnel          |  52 --
 net-scripts/net.modules.d/iptunnel.sh       |  52 ++
 net-scripts/net.modules.d/iwconfig          | 943 ----------------------------
 net-scripts/net.modules.d/iwconfig.sh       | 943 ++++++++++++++++++++++++++++
 net-scripts/net.modules.d/macchanger        | 102 ---
 net-scripts/net.modules.d/macchanger.sh     | 102 +++
 net-scripts/net.modules.d/macnet            |  43 --
 net-scripts/net.modules.d/macnet.sh         |  43 ++
 net-scripts/net.modules.d/netplugd          | 124 ----
 net-scripts/net.modules.d/netplugd.sh       | 124 ++++
 net-scripts/net.modules.d/pppd              | 279 --------
 net-scripts/net.modules.d/pppd.sh           | 279 ++++++++
 net-scripts/net.modules.d/pump              | 105 ----
 net-scripts/net.modules.d/pump.sh           | 105 ++++
 net-scripts/net.modules.d/rename            |  63 --
 net-scripts/net.modules.d/rename.sh         |  63 ++
 net-scripts/net.modules.d/system            | 155 -----
 net-scripts/net.modules.d/system.sh         | 155 +++++
 net-scripts/net.modules.d/tuntap            | 103 ---
 net-scripts/net.modules.d/tuntap.sh         | 103 +++
 net-scripts/net.modules.d/udhcpc            | 117 ----
 net-scripts/net.modules.d/udhcpc.sh         | 117 ++++
 net-scripts/net.modules.d/vlan              | 154 -----
 net-scripts/net.modules.d/vlan.sh           | 154 +++++
 net-scripts/net.modules.d/wpa_supplicant    | 368 -----------
 net-scripts/net.modules.d/wpa_supplicant.sh | 368 +++++++++++
 sbin/functions.sh                           |  48 +-
 sbin/rc                                     |  12 +-
 sbin/rc-daemon.sh                           |   2 +-
 sbin/rc-services.sh                         |  31 +-
 sbin/runscript.sh                           | 163 ++---
 66 files changed, 5125 insertions(+), 4964 deletions(-)
 delete mode 100644 etc/conf.d/domainname
 delete mode 100755 init.d/domainname
 delete mode 100644 net-scripts/net.modules.d/adsl
 create mode 100644 net-scripts/net.modules.d/adsl.sh
 delete mode 100644 net-scripts/net.modules.d/apipa
 create mode 100644 net-scripts/net.modules.d/apipa.sh
 delete mode 100644 net-scripts/net.modules.d/arping
 create mode 100644 net-scripts/net.modules.d/arping.sh
 delete mode 100644 net-scripts/net.modules.d/bonding
 create mode 100644 net-scripts/net.modules.d/bonding.sh
 delete mode 100644 net-scripts/net.modules.d/bridge
 create mode 100644 net-scripts/net.modules.d/bridge.sh
 delete mode 100644 net-scripts/net.modules.d/dhclient
 create mode 100644 net-scripts/net.modules.d/dhclient.sh
 delete mode 100644 net-scripts/net.modules.d/dhcpcd
 create mode 100644 net-scripts/net.modules.d/dhcpcd.sh
 delete mode 100644 net-scripts/net.modules.d/essidnet
 create mode 100644 net-scripts/net.modules.d/essidnet.sh
 delete mode 100644 net-scripts/net.modules.d/ifconfig
 create mode 100644 net-scripts/net.modules.d/ifconfig.sh
 delete mode 100644 net-scripts/net.modules.d/ifplugd
 create mode 100644 net-scripts/net.modules.d/ifplugd.sh
 delete mode 100644 net-scripts/net.modules.d/ip6to4
 create mode 100644 net-scripts/net.modules.d/ip6to4.sh
 delete mode 100644 net-scripts/net.modules.d/ipppd
 create mode 100644 net-scripts/net.modules.d/ipppd.sh
 delete mode 100644 net-scripts/net.modules.d/iproute2
 create mode 100644 net-scripts/net.modules.d/iproute2.sh
 delete mode 100644 net-scripts/net.modules.d/iptunnel
 create mode 100644 net-scripts/net.modules.d/iptunnel.sh
 delete mode 100644 net-scripts/net.modules.d/iwconfig
 create mode 100644 net-scripts/net.modules.d/iwconfig.sh
 delete mode 100644 net-scripts/net.modules.d/macchanger
 create mode 100644 net-scripts/net.modules.d/macchanger.sh
 delete mode 100644 net-scripts/net.modules.d/macnet
 create mode 100644 net-scripts/net.modules.d/macnet.sh
 delete mode 100644 net-scripts/net.modules.d/netplugd
 create mode 100644 net-scripts/net.modules.d/netplugd.sh
 delete mode 100644 net-scripts/net.modules.d/pppd
 create mode 100644 net-scripts/net.modules.d/pppd.sh
 delete mode 100644 net-scripts/net.modules.d/pump
 create mode 100644 net-scripts/net.modules.d/pump.sh
 delete mode 100644 net-scripts/net.modules.d/rename
 create mode 100644 net-scripts/net.modules.d/rename.sh
 delete mode 100644 net-scripts/net.modules.d/system
 create mode 100644 net-scripts/net.modules.d/system.sh
 delete mode 100644 net-scripts/net.modules.d/tuntap
 create mode 100644 net-scripts/net.modules.d/tuntap.sh
 delete mode 100644 net-scripts/net.modules.d/udhcpc
 create mode 100644 net-scripts/net.modules.d/udhcpc.sh
 delete mode 100644 net-scripts/net.modules.d/vlan
 create mode 100644 net-scripts/net.modules.d/vlan.sh
 delete mode 100644 net-scripts/net.modules.d/wpa_supplicant
 create mode 100644 net-scripts/net.modules.d/wpa_supplicant.sh

diff --git a/ChangeLog b/ChangeLog
index 7c6a153..261af73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,56 @@
 
     Give a better error message when no valid DHCP client is installed.
 
+  05 Apr 2006; Roy Marples <uberlord@gentoo.org>:
+
+    runscript.sh now stores the fact that it failed to to /dev/.rcsysinit
+    existing in the directory /dev/.rcafterinit. rc adds services in
+    /dev/.rcafterinit to the boot list and then rm -f's that directory. This
+    solves the issue of udev-089 forcing coldplug removal.
+
+  03 Apr 2006; Roy Marples <uberlord@gentoo.org>:
+
+    rc-status doesn't report broken symlinks when querying all levels,
+    #113755 again.
+
+    All net modules how have a .sh suffix to indicate that they are shell
+    scripts as not everyone uses vim.
+
+    runscript.sh now has a --nodeps option so that no depends are checked
+    when starting and stopping a service.
+
+    net.lo and system modules now support resolvconf instead of using our
+    own internal system.
+
+    DHCP and PPP clients no longer have helper scripts. As such they don't
+    change service status at all. Moved helpers.d/functions back into net.lo
+
+    Moved {get,save}_options from functions.sh to rc-services.sh
+
+    Removed whole load of crud from hostname init script, fixes #38172 again
+    and #122794. Also, it's no longer a critical service as defined by rc.
+
+    Added net modules for ccwgroup (s390 qeth ethernet) and br2684ctl
+    (speedtouch usb).
+
+    Removed xargs and find from all net scripts as /usr maybe net mounted,
+    #107260.
+
+    Punted the domainname script. Functionality has been in conf.d/net so you
+    can do this.
+      dns_domain_lo="foo"
+      nis_domain_lo="bar"
+
+    ppd module now checks to see if link exists if prefixed with /, #126916.
+
+  28 Mar 2006; Mike Frysinger <vapier@gentoo.org>:
+
+    Make sure rc-status exit status is 0 #127733 by Timo Boettcher.
+
+  23 Mar 2006; Mike Frysinger <vapier@gentoo.org>:
+
+    Disable hwclock script on s390 hosts.
+
   14 Mar 2006; Roy Marples <uberlord@gentoo.org>:
 
     Allow services that depend on net to be stopped/started in post
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 3e65375..439b064 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,52 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
 
+  06 Apr 2006; Christian Heim <phreak@gentoo.org>:
+  Merging latest changes to the baselayout/trunk changes. This merge is based
+  upon revision 1959.
+
+    ChangeLog                                             |   50
+    ChangeLog.vserver                                     |   46
+    bin/rc-status                                         |    7
+    etc/conf.d/domainname                                 |   20
+    init.d/bootmisc                                       |    6
+    init.d/domainname                                     |   63 -
+    init.d/hostname                                       |   34
+    net-scripts/conf.d/net.example                        |    8
+    net-scripts/init.d/net.lo                             |  287 +++--
+    net-scripts/net.modules.d/adsl                        |   93 -
+    net-scripts/net.modules.d/apipa                       |   46
+    net-scripts/net.modules.d/arping                      |  109 --
+    net-scripts/net.modules.d/bonding                     |  120 --
+    net-scripts/net.modules.d/bridge                      |  198 ---
+    net-scripts/net.modules.d/dhclient                    |  150 --
+    net-scripts/net.modules.d/dhcpcd                      |  123 --
+    net-scripts/net.modules.d/essidnet                    |   49
+    net-scripts/net.modules.d/ifconfig                    |  453 --------
+    net-scripts/net.modules.d/ifplugd                     |  146 --
+    net-scripts/net.modules.d/ip6to4                      |   97 -
+    net-scripts/net.modules.d/ipppd                       |   72 -
+    net-scripts/net.modules.d/iproute2                    |  392 -------
+    net-scripts/net.modules.d/iptunnel                    |   52
+    net-scripts/net.modules.d/iwconfig                    |  943 ------------------
+    net-scripts/net.modules.d/macchanger                  |  102 -
+    net-scripts/net.modules.d/macnet                      |   43
+    net-scripts/net.modules.d/netplugd                    |  124 --
+    net-scripts/net.modules.d/pppd                        |  279 -----
+    net-scripts/net.modules.d/pump                        |  105 --
+    net-scripts/net.modules.d/rename                      |   63 -
+    net-scripts/net.modules.d/system                      |  155 --
+    net-scripts/net.modules.d/tuntap                      |  103 -
+    net-scripts/net.modules.d/udhcpc                      |  117 --
+    net-scripts/net.modules.d/vlan                        |  154 --
+    net-scripts/net.modules.d/wpa_supplicant              |  368 -------
+    sbin/functions.sh                                     |   48
+    sbin/rc                                               |   12
+    sbin/rc-daemon.sh                                     |    2
+    sbin/rc-services.sh                                   |   31
+    sbin/runscript.sh                                     |  163 +--
+    40 files changed, 469 insertions(+), 4964 deletions(-)
+
   17 Mar 2006; Christian Heim <phreak@gentoo.org>:
   Merging latest changes to the baselayout/trunk changes. This merge is based
   upon revision 1948.
diff --git a/bin/rc-status b/bin/rc-status
index 4f6a29a..64b7807 100755
--- a/bin/rc-status
+++ b/bin/rc-status
@@ -208,7 +208,7 @@ for level in ${runlevelidxs} ; do
 	echo "Runlevel: ${HILITE}${level}${NORMAL}"
 	for service in ${runlevels[${arridx}]} ; do
 		if [[ ! -e "${runleveldir}/${level}/${service}" \
-			&& ${level} != "UNASSIGNED" \
+			&& ${level} != "UNASSIGNED" && ${level} != "all" \
 			]] && [[ ${level} != "${BOOTLEVEL}" \
 			|| " ${boot_crit} " != *" ${service} "* ]]; then
 			print_msg "${service}" "${BAD}" 'broken  '
@@ -226,11 +226,14 @@ for level in ${runlevelidxs} ; do
 		fi
 	done
 	let "arridx += 1"
-	[ -n "${UNUSED}" ] && exit 0
+	[ -n "${UNUSED}" ] && break
 done
 
 if [[ -n ${broken} ]]; then
     eerror "You have some broken symbolic links as reported by the broken"
     eerror "status above. This can be fixed by removing the broken service"
     eerror "from its runlevel and re-adding it back using rc-update."
+	exit 1
+else
+	exit 0
 fi
diff --git a/etc/conf.d/domainname b/etc/conf.d/domainname
deleted file mode 100644
index 3a32173..0000000
--- a/etc/conf.d/domainname
+++ /dev/null
@@ -1,20 +0,0 @@
-# /etc/conf.d/domainname
-
-# When setting up resolv.conf, what should take precedence?
-#  0 = let dhcp/whatever override DNSDOMAIN
-#  1 = override dhcp/whatever with DNSDOMAIN
-
-OVERRIDE=1
-
-# To have a proper FQDN, you need to setup /etc/hosts and /etc/resolv.conf
-# (domain entry in /etc/resolv.conf and FQDN in /etc/hosts).
-#
-# DNSDOMAIN merely sets the domain entry in /etc/resolv.conf, see 
-# the resolv.conf(5) manpage for more info.
-
-DNSDOMAIN=""
-
-# For information on setting up NIS, please see:
-#   http://www.linux-nis.org/nis-howto/HOWTO/
-
-NISDOMAIN=""
diff --git a/init.d/bootmisc b/init.d/bootmisc
index 2350b0c..610a4af 100755
--- a/init.d/bootmisc
+++ b/init.d/bootmisc
@@ -34,12 +34,6 @@ start() {
 	# Take care of random stuff [ /var/lock | /var/run | pam ]
 	#
 
-	if [[ -d /var/lib/net-scripts/state ]] ; then
-		ebegin $"Cleaning" /var/lib/net-scripts/state
-		rm -rf /var/lib/net-scripts/state/*
-		eend 0
-	fi
-
 	ebegin $"Cleaning" /var/lock, /var/run
 	rm -rf /var/run/console.lock /var/run/console/*
 
diff --git a/init.d/domainname b/init.d/domainname
deleted file mode 100755
index f7ed8f9..0000000
--- a/init.d/domainname
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need hostname
-	before bootmisc
-}
-
-checkconfig_nis() {
-	if [[ -f /etc/nisdomainname ]] ; then
-		ewarn $"You should stop using /etc/nisdomainname and use /etc/conf.d/domainname"
-		export NISDOMAIN=$(</etc/nisdomainname)
-		return 0
-	fi
-	[[ -n ${NISDOMAIN} ]]
-}
-
-checkconfig_dns() {
-	if [[ -f /etc/dnsdomainname ]] ; then
-		ewarn $"You should stop using /etc/dnsdomainname and use /etc/conf.d/domainname"
-		export DNSDOMAIN=$(</etc/dnsdomainname)
-	fi
-	[[ -z ${DNSDOMAIN} ]] && return 1
-
-	if ! touch /etc/resolv.conf 2> /dev/null ; then
-		ewarn $"Unable to set domain in resolv.conf (ro root?)"
-		return 1
-	else
-		return 0
-	fi
-}
-
-start() {
-	# Ensure that we have a hostname binary or function
-	source /lib/rcscripts/net.modules.d/helpers.d/functions
-
-	local retval=0
-	local retval2=0
-
-	if checkconfig_nis ; then
-		ebegin $"Setting NIS domainname to" ${NISDOMAIN}
-		hostname -y "${NISDOMAIN}"
-		retval=$?
-		eend ${retval} $"Failed to set the NIS domainname"
-	fi
-
-	if checkconfig_dns ; then
-		ebegin $"Setting DNS domainname to" ${DNSDOMAIN}
-		resolv=$(grep -v '^[[:space:]]*domain' /etc/resolv.conf)
-		[[ ${OVERRIDE} == "1" ]] \
-			&& resolv="${resolv}"$'\n'"domain ${DNSDOMAIN}" \
-			|| resolv="domain ${DNSDOMAIN}"$'\n'"${resolv}"
-		echo "${resolv}" > /etc/resolv.conf
-		retval2=$?
-		eend ${retval2} $"Failed to set the DNS domainname"
-	fi
-
-	return $((retval + retval2))
-}
-
-
-# vim:ts=4
diff --git a/init.d/hostname b/init.d/hostname
index c890b89..0a9ec3a 100755
--- a/init.d/hostname
+++ b/init.d/hostname
@@ -3,36 +3,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 start() {
-	# Ensure that we have a hostname binary or function
-	source /lib/rcscripts/net.modules.d/helpers.d/functions
-	
-	local myhost=$(hostname 2>/dev/null)
-	local retval=0
-
-	# If the hostname is already set via the kernel, and /etc/hostname 
-	# isn't setup, then we shouldn't go reseting the configuration #38172.
-	if [[ -z ${myhost} ]] || [[ ${myhost} == "(none)" ]] ; then
-		myhost="localhost"
-	fi
-
 	if [[ -f /etc/hostname ]] ; then
-		ewarn $"You should stop using /etc/hostname and use /etc/conf.d/hostname"
-		myhost=$(</etc/hostname)
-	else
-		myhost=${HOSTNAME}
-	fi
-
-	ebegin $"Setting hostname to" ${myhost}
-	hostname "${myhost}"
-	retval=$?
-	eend ${retval} $"Failed to set the hostname"
-
-	if [[ ${retval} -eq 0 ]] ; then
-		# setup $HOSTNAME, ignore errors in case /etc is readonly.
-		echo "HOSTNAME=\"${myhost}\"" 2>/dev/null > /etc/env.d/01hostname
+		ewarn "You should stop using /etc/hostname and use /etc/conf.d/hostname"
+		HOSTNAME="$(< /etc/hostname)"
 	fi
 
-	return ${retval}
+	ebegin "Setting hostname to ${HOSTNAME}"
+	hostname "${HOSTNAME}"
+	eend $? "Failed to set the hostname"
 }
 
-# vim:ts=4
+# vim: ts=4 :
diff --git a/net-scripts/conf.d/net.example b/net-scripts/conf.d/net.example
index f77c38f..5f6feaa 100644
--- a/net-scripts/conf.d/net.example
+++ b/net-scripts/conf.d/net.example
@@ -494,9 +494,15 @@
 # TUN/TAP
 # For TUN/TAP support emerge net-misc/openvpn or sys-apps/usermode-utilities
 #
-# NOTE: The interface name must be either tun or tap followed by a number
+# You must specify if we're a tun or tap device. Then you can give it any
+# name you like - such as vpn
+#tuntap_vpn="tun"
 #config_tun1=( "192.168.0.1/24")
 
+# Or stick wit the generic names - like tap0
+#tuntap_tap0="tap"
+#config_tap0=( "192.168.0.1/24")
+
 # For passing custom options to tunctl use something like the following.  This
 # example sets the owner to adm
 #tunctl_tun1="-u adm"
diff --git a/net-scripts/init.d/net.lo b/net-scripts/init.d/net.lo
index f73dfac..4734a59 100755
--- a/net-scripts/init.d/net.lo
+++ b/net-scripts/init.d/net.lo
@@ -12,6 +12,7 @@
 # runlevel as the net.* script that needs it.
 depend() {
 	need localmount
+	after hostname
 	use isapnp isdn pcmcia usb wlan
 
 	# Load any custom depend functions for the given interface
@@ -25,9 +26,6 @@ depend() {
 # Define where our modules are
 MODULES_DIR="${svclib}/net.modules.d"
 
-# Load some functions shared between ourselves and our DHCP helpers
-source "${MODULES_DIR}/helpers.d/functions"
-
 # Make some wrappers to fudge after/before/need/use depend flags.
 # These are callbacks so MODULE will be set.
 after() {
@@ -54,11 +52,176 @@ variables() {
 	eval "${MODULE}_variables() { echo \"$*\"; }"
 }
 
+is_loopback() {
+	[[ $1 == "lo" || $1 == "lo"[0-9]* ]]
+}
+
+# char* interface_device(char *iface)
+#
+# Gets the base device of the interface
+# Can handle eth0:1 and eth0.1
+# Which returns eth0 in this case
+interface_device() {
+	local dev="${1%%.*}"
+	[[ ${dev} == "$1" ]] && dev="${1%%:*}"
+	echo "${dev}"
+}
+
+# char* interface_type(char* iface)
+#
+# Returns the base type of the interface
+# eth, ippp, etc
+interface_type() {
+	echo "${1%%[0-9]*}"
+}
+
+# int calculate_metric(char *interface)
+#
+# Calculates the best metric for the interface
+# The Linux kernel does not use this at the moment, but we use it so that
+# default routes remain and we can work out the "best" interface
+calculate_metric() {
+	local iface="$1" exclude='$1!="Iface" && $1!="lo"'
+
+	# Have we already got a metric?
+	local m="$( awk '$1=="'${iface}'" && $2=="00000000" { print $7 }' \
+		/proc/net/route )"
+	if [[ -n ${m} ]] ; then
+		echo "${m}"
+		return 0
+	fi
+
+	local itype="$(interface_type "${iface}")" x i
+
+	# If we're not a wireless device then exclude wireless from the
+	# routing table so we stay < 1000
+	if [[ -e /proc/net/wireless ]] ; then
+		if ! grep -q "^[ \t]*${iface}:[ \t]" /proc/net/wireless ; then
+			local i="$(sed -n -e 's/^[ \t]*\(.*\):.*/\1/p' /proc/net/wireless)"
+			for x in ${i} ; do
+				exclude="${exclude} && "'$1'"!=\"${x}\""
+			done
+		fi
+	fi
+
+	# Exclude ppp and ippp as well
+	local ix="ppp|ippp"
+	[[ ${itype} == "ppp" ]] && ix="ippp"
+	[[ ${itype} == "ippp" ]] && ix="ppp"
+	i="$( sed -n -e 's/^[ ]*\('"${ix}"'[0-9]*\):.*$/\1/p' /proc/net/dev )"
+	for x in ${i} ; do
+		exclude="${exclude} && "'$1'"!=\"${x}\""
+	done
+
+	local m="$( awk "${exclude} { print "'$7'" }" /proc/net/route \
+		| sort -rn | head -n 1 | cut -d' ' -f2 )"
+	m="${m:--1}"
+	(( m ++ ))
+
+	# If we're a wireless device then add 1000 so that wired interfaces take preference
+	if [[ -e /proc/net/wireless ]] ; then
+		grep -q "^[ \t]*${iface}:[ \t]" /proc/net/wireless && (( m+= 1000 ))
+	fi
+
+	# If we're a ppp device then we add 2000 for ISDN, otherwise 3000
+	[[ ${itype} == "ippp" ]] && (( m+= 2000 ))
+	[[ ${itype} == "ppp" ]] && (( m+= 3000 ))
+
+	echo "${m}"
+}
+
+# int netmask2cidr(char *netmask)
+#
+# Returns the CIDR of a given netmask
+netmask2cidr() {
+	local binary="" i bin
+
+	for i in ${1//./ }; do
+		bin=""
+		while [[ ${i} != "0" ]] ; do
+			bin=$[${i}%2]${bin}
+			(( i=i>>1 ))
+		done
+		binary="${binary}${bin}"
+	done
+	binary="${binary%%0*}"
+	echo "${#binary}"
+}
+
+
+# bool is_function(char* name)
+#
+# Returns 0 if the given name is a shell function, otherwise 1
+is_function() {
+	[[ -z $1 ]] && return 1
+	[[ $(type -t "$1") == "function" ]]
+}
+
+# void function_wrap(char* source, char* target)
+#
+# wraps function calls - for example function_wrap(this, that)
+# maps function names this_* to that_*
+function_wrap() {
+	local i
+
+	is_function "${2}_depend" && return
+
+	for i in $( typeset -f | grep -o '^'"${1}"'_[^ ]*' ); do
+		eval "${2}${i#${1}}() { ${i} \"\$@\"; }"
+	done
+}
+
+# char[] * expand_parameters(char *cmd)
+#
+# Returns an array after expanding parameters. For example
+# "192.168.{1..3}.{1..3}/24 brd +"
+# will return
+# "192.168.1.1/24 brd +"
+# "192.168.1.2/24 brd +"
+# "192.168.1.3/24 brd +"
+# "192.168.2.1/24 brd +"
+# "192.168.2.2/24 brd +"
+# "192.168.2.3/24 brd +"
+# "192.168.3.1/24 brd +"
+# "192.168.3.2/24 brd +"
+# "192.168.3.3/24 brd +"
+expand_parameters() {
+	local x="$( eval echo ${@// /_} )"
+	local -a a=( ${x} )
+
+	a=( "${a[@]/#/\"}" )
+	a=( "${a[@]/%/\"}" )
+	echo "${a[*]//_/ }"
+}
+
+# void configure_variables(char *interface, char *option1, [char *option2])
+#
+# Maps configuration options from <variable>_<option> to <variable>_<iface>
+# option2 takes precedence over option1
+configure_variables() {
+	local iface="$1" option1="$2" option2="$3"
+
+	local mod func x i
+	local -a ivars ovars1 ovars2
+	local ifvar="$(bash_variable "${iface}")"
+
+	for mod in ${MODULES[@]}; do
+		is_function ${mod}_variables || continue
+		for v in $(${mod}_variables) ; do
+			x=""
+			[[ -n ${option2} ]] && x="${v}_${option2}[@]"
+			[[ -z ${!x} ]] && x="${v}_${option1}[@]"
+			[[ -n ${!x} ]] && eval "${v}_${ifvar}=( \"\${!x}\" )"
+		done
+	done
+
+	return 0
+}
 # bool module_load_minimum(char *module)
 #
 # Does the minimum checking on a module - even when forcing
 module_load_minimum() {
-	local f="$1" MODULE="${1##*/}"
+	local f="$1.sh" MODULE="${1##*/}"
 
 	if [[ ! -f ${f} ]] ; then
 		eerror "${f} does not exist"
@@ -72,7 +235,7 @@ module_load_minimum() {
 
 	for f in depend; do
 		is_function "${MODULE}_${f}" && continue
-		eerror "${MODULE} does not support the required function ${f}"
+		eerror "${MODULE}.sh does not support the required function ${f}"
 		return 1
 	done
 
@@ -88,7 +251,7 @@ modules_load_auto() {
 
 	# Populate the MODULES array
 	# Basically we treat evey file in ${MODULES_DIR} as a module
-	MODULES=( $( cd "${MODULES_DIR}" ; ls ) )
+	MODULES=( $( cd "${MODULES_DIR}" ; ls *.sh ) )
 	j="${#MODULES[@]}"
 	for (( i=0; i<j; i++ )); do
 		MODULES[i]="${MODULES_DIR}/${MODULES[i]}"
@@ -103,6 +266,7 @@ modules_load_auto() {
 	j="${#MODULES[@]}"
 	loaded_interface=false
 	for (( i=0; i<j; i++ )); do
+		MODULES[i]="${MODULES[i]%.sh*}"
 		if [[ ${MODULES[i]##*/} == "interface" ]] ; then
 			eerror "interface is a reserved name - cannot load a module called interface"
 			return 1
@@ -121,7 +285,7 @@ modules_load_auto() {
 		)
 
 		if [[ $? == 0 ]] ; then
-			source "${MODULES[i]}"
+			source "${MODULES[i]}.sh"
 			MODULES[i]="${MODULES[i]##*/}"
 		else
 			unset MODULES[i]
@@ -217,8 +381,8 @@ modules_check_user() {
 
 			# The function may not exist because the modules software is
 			# not installed. Load the module and report its error
-			if [[ -e "${MODULES_DIR}/${umods[i]}" ]] ; then
-				source "${MODULES_DIR}/${umods[i]}"
+			if [[ -e "${MODULES_DIR}/${umods[i]}.sh" ]] ; then
+				source "${MODULES_DIR}/${umods[i]}.sh"
 				is_function "${umods[i]}_check_installed" \
 					&& ${umods[i]}_check_installed true
 			else
@@ -404,7 +568,7 @@ modules_load()  {
 	local RC_INDENTATION="${RC_INDENTATION}"
 	local -a PROVIDES WRAP_MODULES
 
-	if [[ ${iface} != "lo" ]] ; then
+	if ! is_loopback "${iface}" ; then
 		x="modules_force_${iface}[@]"
 		[[ -n ${!x} ]] && modules_force=( "${!x}" )
 		if [[ -n ${modules_force} ]] ; then
@@ -510,14 +674,10 @@ iface_start() {
 	local -a config fallback fallback_route conf a b 
 	local ifvar="$(bash_variable "$1")" i j
 
-	# Try and work out a metric for the interface if we're on auto
+	# Try and work out a metric for the interface
 	x="metric_${ifvar}"
 	if [[ -z ${!x} ]] ; then
-		if [[ ${RC_AUTO_INTERFACE} == "yes" ]] ; then
-			eval "metric_${ifvar}=\"$(calculate_metric ${iface})\""
-		else
-			eval "metric_${ifvar}=0"
-		fi
+		eval "metric_${ifvar}=\"$(calculate_metric ${iface})\""
 	fi
 
 	# pre Start any modules with
@@ -572,18 +732,13 @@ iface_start() {
 	# Provide a default of DHCP if no configuration is set and we're auto
 	# Otherwise a default of NULL
 	if [[ -z ${config} ]] ; then
-#		if [[ ${RC_AUTO_INTERFACE} == "yes" ]] ; then
-			ewarn "Configuration not set for ${iface} - assuming DHCP"
-			if is_function "dhcp_start" ; then
-				config=( "dhcp" )
-			else
-				eerror "No DHCP client installed"
-				return 1
-			fi
-#		else
-#			config=( "null" )
-#			ewarn "Configuration not set for ${iface} - assuming null"
-#		fi
+		ewarn "Configuration not set for ${iface} - assuming DHCP"
+		if is_function "dhcp_start" ; then
+			config=( "dhcp" )
+		else
+			eerror "No DHCP client installed"
+			return 1
+		fi
 	fi
 
 	einfo "Bringing up ${iface}"
@@ -612,11 +767,12 @@ iface_start() {
 			# We do this by testing if the 1st character is a digit
 		elif [[ ${conf[0]:0:1} == [[:digit:]] || ${conf[0]} == *:* ]] ; then
 			x="0"
-			if [[ ${RC_AUTO_INTERFACE} == "yes" ]] \
-				&& is_function arping_address_exists ; then
-				if arping_address_exists "${iface}" "${conf[0]}" ; then
-					eerror "${conf[0]%%/*} already taken on ${iface}"
-					x="1"
+			if ! is_loopback "${iface}" ; then
+				if is_function arping_address_exists ; then
+					if arping_address_exists "${iface}" "${conf[0]}" ; then
+						eerror "${conf[0]%%/*} already taken on ${iface}"
+						x="1"
+					fi
 				fi
 			fi
 			[[ ${x} == "0" ]] && interface_add_address "${iface}" ${conf[@]}; x="$?"
@@ -672,7 +828,9 @@ iface_stop() {
 
 	# pre Stop any modules
 	for mod in ${MODULES[@]}; do
-		is_function "${mod}_pre_stop" && ${mod}_pre_stop "${iface}"
+		if is_function "${mod}_pre_stop" ; then
+			${mod}_pre_stop "${iface}" || return 1
+		fi
 	done
 
 	einfo "Bringing down ${iface}"
@@ -691,7 +849,9 @@ iface_stop() {
 	for i in ${aliases} ${iface}; do
 		# Stop all our modules
 		for mod in ${MODULES[@]}; do
-			is_function "${mod}_stop" && ${mod}_stop "${i}"
+			if is_function "${mod}_stop" ; then
+				${mod}_stop "${i}" || return 1
+			fi
 		done
 
 		# A module may have removed the interface
@@ -738,6 +898,10 @@ run_start() {
 		metric_lo="0"
 		config_lo=( "127.0.0.1/8 brd 127.255.255.255" "${config_lo[@]}" )
 		routes_lo=( "127.0.0.0/8" "${routes_lo[@]}" )
+	elif [[ ${iface} == "lo0" ]] ; then
+		metric_lo0="0"
+		config_lo0=( "127.0.0.1/8 brd 127.255.255.255" "${config_lo[@]}" )
+		routes_lo0=( "127.0.0.0/8" "${routes_lo[@]}" )
 	fi
 
 	# We may not have a loaded module for ${iface}
@@ -833,6 +997,9 @@ run_stop() {
 
 	iface_stop "${iface}" || return 1  # always succeeds, btw
 
+	# Release resolv.conf information.
+	[[ -x /sbin/resolvconf ]] && resolvconf -d "${iface}"
+	
 	# Mark us as inactive if called from the background
 	[[ ${IN_BACKGROUND} == "true" ]] && mark_service_inactive "net.${iface}"
 
@@ -848,6 +1015,7 @@ run_stop() {
 		eoutdent
 	fi
 
+
 	return 0
 }
 
@@ -876,7 +1044,9 @@ run() {
 	[[ ${cmd} == "stop" ]] && starting=false
 
 	# We force lo to only use these modules for a major speed boost
-	[[ ${iface} == "lo" ]] && modules_force=( "iproute2" "ifconfig" "system" )
+	if is_loopback "${iface}" ; then	
+		modules_force=( "iproute2" "ifconfig" "system" )
+	fi
 
 	if modules_load "${iface}" "${starting}" ; then
 		if [[ ${cmd} == "stop" ]] ; then
@@ -887,7 +1057,6 @@ run() {
 			done
 
 			run_stop "${iface}" && r=0
-			remove_state "${iface}"
 		else
 			# Only hotplug on ethernet interfaces
 			if [[ ${IN_HOTPLUG} == 1 ]] ; then
@@ -901,19 +1070,7 @@ run() {
 		fi
 	fi
 
-	# Only apply best state if we're on auto
-	if [[ ${r} == "0" ]] ; then
-		local siface=""
-		if [[ ${RC_AUTO_INTERFACE} == "yes" ]] ; then
-			siface="$(select_best_interface)"
-			if [[ -n ${siface} ]] ; then
-				einfo "Selecting best interface: ${siface}"
-			fi
-		elif [[ ${cmd} == "start" ]] ; then
-			siface="${iface}"
-		fi
-		[[ -n ${siface} ]] && apply_state "${siface}"
-	else
+	if [[ ${r} != "0" ]] ; then
 		if [[ ${cmd} == "start" ]] ; then
 			# Call user-defined failup if it exists
 			if is_function failup ; then
@@ -938,23 +1095,6 @@ run() {
 	return "${r}"
 }
 
-# void link_file(char *file)
-#
-# Move a config file from /etc to ${netdir} and creates a link if needed.
-# This enables net-scripts to control the config file for interface management
-# and allow /etc to become read only.
-link_file() {
-	local file="$1"
-	local link="$(readlink "/etc/${file}" 2>/dev/null)"
-	if [[ ${link} != "${netdir}/${file}" ]] ; then
-		if [[ -f "/etc/${file}" ]] ; then
-			vewarn "Moving /etc/${file} to ${netdir}/${file} and creating link"
-			mv "/etc/${file}" "${netdir}"
-			ln -snf "${netdir}/${file}" "/etc/${file}"
-		fi
-	fi
-}
-
 # bool start(void)
 #
 # Start entry point so that we only have one function
@@ -974,19 +1114,6 @@ start() {
 		fi
 	fi
 
-	if [[ ! -d "${statedir}/${IFACE}" ]] ; then
-		if ! mkdir -m 0755 -p "${statedir}/${IFACE}" ; then
-			eerror "Unable to create state directory!"
-			return 1
-		fi
-	fi
-
-	if [[ ${RC_AUTO_INTERFACE} == "yes" ]] ; then
-		link_file "resolv.conf"
-		link_file "ntp.conf"
-		link_file "yp.conf"
-	fi
-
 	einfo "Starting ${IFACE}"
 	run "${IFACE}" start
 }
diff --git a/net-scripts/net.modules.d/adsl b/net-scripts/net.modules.d/adsl
deleted file mode 100644
index 0dcc677..0000000
--- a/net-scripts/net.modules.d/adsl
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void adsl_depend(void)
-#
-# Sets up the dependancies for the module
-adsl_depend() {
-	before dhcp
-}
-
-# bool adsl_check_installed(void)
-#
-# Returns 1 if rp-pppoe is installed, otherwise 0
-adsl_check_installed() {
-	[[ -x /usr/sbin/adsl-start || -x /usr/sbin/pppoe-start ]] && return 0
-	${1:-false} && eerror "For ADSL support, emerge net-dialup/rp-pppoe"
-	return 1
-}
-
-# bool adsl_setup_vars(char *iface)
-#
-# Checks to see if the ADSL script has been created or not
-adsl_setup_vars() {
-	local iface="$1" startstop="$2" cfgexe
-
-	if [[ -x /usr/sbin/pppoe-start ]]; then
-		exe="/usr/sbin/pppoe-${startstop}"
-		cfgexe=pppoe-setup
-	else
-		exe="/usr/sbin/adsl-${startstop}"
-		cfgexe=adsl-setup
-	fi
-
-	# Decide which configuration to use.  Hopefully there is an
-	# interface-specific one
-	cfgfile="/etc/ppp/pppoe-${iface}.conf"
-	[[ -f ${cfgfile} ]] || cfgfile="/etc/ppp/pppoe.conf"
-
-	if [[ ! -f ${cfgfile} ]]; then
-		eerror "no pppoe.conf file found!"
-		eerror "Please run ${cfgexe} to create one"
-		return 1
-	fi
-
-	return 0
-}
-
-# bool adsl_start(char *iface)
-#
-# Start ADSL on an interface by calling adsl-start
-#
-# Returns 0 (true) when successful, non-zero otherwise
-adsl_start() {
-	local iface="$1" exe cfgfile user ifvar="$(bash_variable "$1")"
-
-	adsl_setup_vars "${iface}" start || return 1
-
-	# Might or might not be set in conf.d/net
-	user="adsl_user_${ifvar}"
-
-	# Start ADSL with the cfgfile, but override ETH and PIDFILE
-	einfo "Starting ADSL for ${iface}"
-	${exe} <(cat "${cfgfile}"; \
-		echo "ETH=${iface}"; \
-		echo "PIDFILE=/var/run/rp-pppoe-${iface}.pid"; \
-		[[ -n ${!user} ]] && echo "USER=${!user}") \
-		>/dev/null
-	eend $?
-}
-
-# bool adsl_stop(char *iface)
-#
-# Returns 0 when there is no ADSL to stop or we stop ADSL successfully
-# Otherwise 1
-adsl_stop() {
-	local iface="$1" exe cfgfile
-
-	adsl_check_installed || return 1
-	[[ ! -f "/var/run/rp-pppoe-${iface}.pid" ]] && return 0
-
-	adsl_setup_vars "${iface}" stop || return 1
-
-	einfo "Stopping ADSL for ${iface}"
-	${exe} <(cat "${cfgfile}"; \
-		echo "ETH=${iface}"; echo "PIDFILE=/var/run/rp-pppoe-${iface}.pid") \
-		>/dev/null
-	eend $?
-
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/adsl.sh b/net-scripts/net.modules.d/adsl.sh
new file mode 100644
index 0000000..0dcc677
--- /dev/null
+++ b/net-scripts/net.modules.d/adsl.sh
@@ -0,0 +1,93 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void adsl_depend(void)
+#
+# Sets up the dependancies for the module
+adsl_depend() {
+	before dhcp
+}
+
+# bool adsl_check_installed(void)
+#
+# Returns 1 if rp-pppoe is installed, otherwise 0
+adsl_check_installed() {
+	[[ -x /usr/sbin/adsl-start || -x /usr/sbin/pppoe-start ]] && return 0
+	${1:-false} && eerror "For ADSL support, emerge net-dialup/rp-pppoe"
+	return 1
+}
+
+# bool adsl_setup_vars(char *iface)
+#
+# Checks to see if the ADSL script has been created or not
+adsl_setup_vars() {
+	local iface="$1" startstop="$2" cfgexe
+
+	if [[ -x /usr/sbin/pppoe-start ]]; then
+		exe="/usr/sbin/pppoe-${startstop}"
+		cfgexe=pppoe-setup
+	else
+		exe="/usr/sbin/adsl-${startstop}"
+		cfgexe=adsl-setup
+	fi
+
+	# Decide which configuration to use.  Hopefully there is an
+	# interface-specific one
+	cfgfile="/etc/ppp/pppoe-${iface}.conf"
+	[[ -f ${cfgfile} ]] || cfgfile="/etc/ppp/pppoe.conf"
+
+	if [[ ! -f ${cfgfile} ]]; then
+		eerror "no pppoe.conf file found!"
+		eerror "Please run ${cfgexe} to create one"
+		return 1
+	fi
+
+	return 0
+}
+
+# bool adsl_start(char *iface)
+#
+# Start ADSL on an interface by calling adsl-start
+#
+# Returns 0 (true) when successful, non-zero otherwise
+adsl_start() {
+	local iface="$1" exe cfgfile user ifvar="$(bash_variable "$1")"
+
+	adsl_setup_vars "${iface}" start || return 1
+
+	# Might or might not be set in conf.d/net
+	user="adsl_user_${ifvar}"
+
+	# Start ADSL with the cfgfile, but override ETH and PIDFILE
+	einfo "Starting ADSL for ${iface}"
+	${exe} <(cat "${cfgfile}"; \
+		echo "ETH=${iface}"; \
+		echo "PIDFILE=/var/run/rp-pppoe-${iface}.pid"; \
+		[[ -n ${!user} ]] && echo "USER=${!user}") \
+		>/dev/null
+	eend $?
+}
+
+# bool adsl_stop(char *iface)
+#
+# Returns 0 when there is no ADSL to stop or we stop ADSL successfully
+# Otherwise 1
+adsl_stop() {
+	local iface="$1" exe cfgfile
+
+	adsl_check_installed || return 1
+	[[ ! -f "/var/run/rp-pppoe-${iface}.pid" ]] && return 0
+
+	adsl_setup_vars "${iface}" stop || return 1
+
+	einfo "Stopping ADSL for ${iface}"
+	${exe} <(cat "${cfgfile}"; \
+		echo "ETH=${iface}"; echo "PIDFILE=/var/run/rp-pppoe-${iface}.pid") \
+		>/dev/null
+	eend $?
+
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/apipa b/net-scripts/net.modules.d/apipa
deleted file mode 100644
index 4ebd469..0000000
--- a/net-scripts/net.modules.d/apipa
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void apipa_depend(void)
-#
-# Sets up the dependancies for the module
-apipa_depend() {
-	installed arping
-	functions interface_exists
-}
-
-# bool apipa_start(char *iface)
-#
-# Tries to detect a config based on arpinging things
-apipa_start() {
-	local iface="$1" i1 i2 addr i=0
-
-	interface_exists "$1" true || return 1
-	
-	einfo "Searching for free addresses in 169.254.0.0/16"
-	eindent
-
-	while [[ ${i} -lt 64516 ]]; do
-		(( i1=${RANDOM}%255 ))
-		(( i2=${RANDOM}%255 ))
-
-		addr="169.254.${i1}.${i2}"
-		vebegin "${addr}/16"
-		if ! arping_address_exists "${iface}" "${addr}" ; then
-			config[config_counter]="${addr}/16 broadcast 169.254.255.255"
-			(( config_counter-- ))
-			veend 0
-			eoutdent
-			return 0
-		fi
-
-		(( i++ ))
-	done
-
-	eerror "No free address found!"
-	eoutdent
-	return 1
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/apipa.sh b/net-scripts/net.modules.d/apipa.sh
new file mode 100644
index 0000000..4ebd469
--- /dev/null
+++ b/net-scripts/net.modules.d/apipa.sh
@@ -0,0 +1,46 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void apipa_depend(void)
+#
+# Sets up the dependancies for the module
+apipa_depend() {
+	installed arping
+	functions interface_exists
+}
+
+# bool apipa_start(char *iface)
+#
+# Tries to detect a config based on arpinging things
+apipa_start() {
+	local iface="$1" i1 i2 addr i=0
+
+	interface_exists "$1" true || return 1
+	
+	einfo "Searching for free addresses in 169.254.0.0/16"
+	eindent
+
+	while [[ ${i} -lt 64516 ]]; do
+		(( i1=${RANDOM}%255 ))
+		(( i2=${RANDOM}%255 ))
+
+		addr="169.254.${i1}.${i2}"
+		vebegin "${addr}/16"
+		if ! arping_address_exists "${iface}" "${addr}" ; then
+			config[config_counter]="${addr}/16 broadcast 169.254.255.255"
+			(( config_counter-- ))
+			veend 0
+			eoutdent
+			return 0
+		fi
+
+		(( i++ ))
+	done
+
+	eerror "No free address found!"
+	eoutdent
+	return 1
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/arping b/net-scripts/net.modules.d/arping
deleted file mode 100644
index 1a476e7..0000000
--- a/net-scripts/net.modules.d/arping
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void arping_depend(void)
-#
-# Sets up the dependancies for the module
-arping_depend() {
-	functions interface_exists interface_up
-}
-
-# bool arping_check_installed(void)
-#
-# Returns 0 if arping or arping2 is installed, otherwise 1
-arping_check_installed() {
-	[[ -x /sbin/arping || -x /usr/sbin/arping2 ]] && return 0
-	if ${1:-false}; then
-		eerror "For arping support emerge net-misc/iputils or net-analyzer/arping"
-	fi
-	return 1
-}
-
-# bool arping_address_exists(char *interface, char *address)
-#
-# Returns 0 if the address on the interface responds to an arping
-# 1 if not - packets defaults to 1
-# If neither arping (net-misc/iputils) or arping2 (net-analyzer/arping)
-# is installed then we return 1
-arping_address_exists() {
-	local iface="$1" address="${2%%/*}" i
-
-	# We only handle IPv4 addresses
-	[[ ${address} != *.*.*.* ]] && return 1
-
-	# 0.0.0.0 isn't a valid address - and some lusers have configured this
-	[[ ${address} == "0.0.0.0" || ${address} == "0" ]] && return 1
-
-	# We need to bring the interface up to test
-	interface_up "${iface}"
-
-	if [[ -x /sbin/arping ]] ; then
-		/sbin/arping -q -c 2 -w 3 -D -f -I "${iface}" "${address}" \
-		&>/dev/null || return 0
-	elif [[ -x /usr/sbin/arping2 ]] ; then
-		for (( i=0; i<3; i++ )) ; do
-			/usr/sbin/arping2 -0 -c 1 -i "${iface}" "${address}" \
-			&>/dev/null && return 0
-		done
-	fi
-	return 1
-}
-
-# bool arping_start(char *iface)
-#
-# arpings a list of gateways
-# If one is foung then apply it's configuration
-arping_start() {
-	local iface="$1" gateways x conf i
-
-	interface_exists "${iface}" true || return 1
-
-	einfo "Pinging gateways on ${iface} for configuration"
-
-	gateways="gateways_${ifvar}[@]"
-	if [[ -z ${!gateways} ]] ; then
-		eerror "No gateways have been defined (gateways_${ifvar}=\"...\")"
-		return 1
-	fi
-
-	eindent
-	
-	for x in ${!gateways}; do
-		vebegin "${x}"
-		if arping_address_exists "${iface}" "${x}" ; then
-			for i in ${x//./ } ; do
-				if [[ ${#i} == "2" ]] ; then
-					conf="${conf}0${i}"
-				elif [[ ${#i} == "1" ]] ; then
-					conf="${conf}00${i}"
-				else
-					conf="${conf}${i}"
-				fi
-			done
-			veend 0
-			eoutdent
-			veinfo "Configuring ${iface} for ${x}"
-			configure_variables "${iface}" "${conf}"
-
-			# Call the system module as we've aleady passed it by ....
-			# And it *has* to be pre_start for other things to work correctly
-			system_pre_start "${iface}"
-			
-			t="config_${ifvar}[@]"
-			config=( "${!t}" )
-			t="fallback_config_${ifvar}[@]"
-			fallback_config=( "${!t}" )
-			t="fallback_route_${ifvar}[@]"
-			fallback_route=( "${!t}" )
-			config_counter=-1
-			return 0
-		fi
-		veend 1
-	done
-
-	eoutdent
-	return 1
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/arping.sh b/net-scripts/net.modules.d/arping.sh
new file mode 100644
index 0000000..1a476e7
--- /dev/null
+++ b/net-scripts/net.modules.d/arping.sh
@@ -0,0 +1,109 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void arping_depend(void)
+#
+# Sets up the dependancies for the module
+arping_depend() {
+	functions interface_exists interface_up
+}
+
+# bool arping_check_installed(void)
+#
+# Returns 0 if arping or arping2 is installed, otherwise 1
+arping_check_installed() {
+	[[ -x /sbin/arping || -x /usr/sbin/arping2 ]] && return 0
+	if ${1:-false}; then
+		eerror "For arping support emerge net-misc/iputils or net-analyzer/arping"
+	fi
+	return 1
+}
+
+# bool arping_address_exists(char *interface, char *address)
+#
+# Returns 0 if the address on the interface responds to an arping
+# 1 if not - packets defaults to 1
+# If neither arping (net-misc/iputils) or arping2 (net-analyzer/arping)
+# is installed then we return 1
+arping_address_exists() {
+	local iface="$1" address="${2%%/*}" i
+
+	# We only handle IPv4 addresses
+	[[ ${address} != *.*.*.* ]] && return 1
+
+	# 0.0.0.0 isn't a valid address - and some lusers have configured this
+	[[ ${address} == "0.0.0.0" || ${address} == "0" ]] && return 1
+
+	# We need to bring the interface up to test
+	interface_up "${iface}"
+
+	if [[ -x /sbin/arping ]] ; then
+		/sbin/arping -q -c 2 -w 3 -D -f -I "${iface}" "${address}" \
+		&>/dev/null || return 0
+	elif [[ -x /usr/sbin/arping2 ]] ; then
+		for (( i=0; i<3; i++ )) ; do
+			/usr/sbin/arping2 -0 -c 1 -i "${iface}" "${address}" \
+			&>/dev/null && return 0
+		done
+	fi
+	return 1
+}
+
+# bool arping_start(char *iface)
+#
+# arpings a list of gateways
+# If one is foung then apply it's configuration
+arping_start() {
+	local iface="$1" gateways x conf i
+
+	interface_exists "${iface}" true || return 1
+
+	einfo "Pinging gateways on ${iface} for configuration"
+
+	gateways="gateways_${ifvar}[@]"
+	if [[ -z ${!gateways} ]] ; then
+		eerror "No gateways have been defined (gateways_${ifvar}=\"...\")"
+		return 1
+	fi
+
+	eindent
+	
+	for x in ${!gateways}; do
+		vebegin "${x}"
+		if arping_address_exists "${iface}" "${x}" ; then
+			for i in ${x//./ } ; do
+				if [[ ${#i} == "2" ]] ; then
+					conf="${conf}0${i}"
+				elif [[ ${#i} == "1" ]] ; then
+					conf="${conf}00${i}"
+				else
+					conf="${conf}${i}"
+				fi
+			done
+			veend 0
+			eoutdent
+			veinfo "Configuring ${iface} for ${x}"
+			configure_variables "${iface}" "${conf}"
+
+			# Call the system module as we've aleady passed it by ....
+			# And it *has* to be pre_start for other things to work correctly
+			system_pre_start "${iface}"
+			
+			t="config_${ifvar}[@]"
+			config=( "${!t}" )
+			t="fallback_config_${ifvar}[@]"
+			fallback_config=( "${!t}" )
+			t="fallback_route_${ifvar}[@]"
+			fallback_route=( "${!t}" )
+			config_counter=-1
+			return 0
+		fi
+		veend 1
+	done
+
+	eoutdent
+	return 1
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/bonding b/net-scripts/net.modules.d/bonding
deleted file mode 100644
index 6095c74..0000000
--- a/net-scripts/net.modules.d/bonding
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void bonding_depend(void)
-#
-# Sets up the dependancies for the module
-bonding_depend() {
-	before interface macchanger
-	functions interface_exists interface_up interface_down \
-		interface_del_addresses
-}
-
-# void bonding_expose(void)
-#
-# Expose variables that can be configured
-bonding_expose() {
-	variables slaves
-}
-
-# bool bonding_check_installed(void)
-#
-# Returns 0 if ifenslave is installed, otherwise 1
-bonding_check_installed() {
-	[[ -x /sbin/ifenslave ]] && return 0
-	${1:-false} && eerror "For link aggregation (bonding) support, emerge net-misc/ifenslave"
-	return 1
-}
-
-# bonding_exists(char *interface)
-#
-# Returns 0 if we are a bonded interface, otherwise 1
-bonding_exists() {
-	[[ -f "/proc/net/bonding/$1" ]]
-}
-
-# bool bonding_post_start(char *iface)
-#
-# Bonds the interface
-bonding_pre_start() {
-	local iface="$1" s ifvar="$(bash_variable "$1")"
-	local -a slaves
-
-	slaves="slaves_${ifvar}[@]"
-	[[ -z ${!slaves} ]] && return 0
-	slaves=( "${!slaves}" )
-
-	# Support space seperated slaves
-	[[ ${#slaves[@]} == 1 ]] && slaves=( ${slaves} )
-
-	interface_exists "${iface}" true || return 1
-
-	if ! bonding_exists "${iface}" ; then
-		eerror "${iface} is not capable of bonding"
-		return 1
-	fi
-
-	ebegin "Adding slaves to ${iface}"
-	eindent
-	einfo "${slaves[@]}"
-
-	# Check that our slaves exist
-	for s in "${slaves[@]}" ; do
-		interface_exists "${s}" true || return 1
-	done
-
-	# Must force the slaves to a particular state before adding them
-	for s in "${slaves[@]}" ; do
-		interface_del_addresses "${s}"
-		interface_up "${s}"
-	done
-
-	# now force the master to up
-	interface_up "${iface}"
-
-	# finally add in slaves
-	eoutdent
-	/sbin/ifenslave "${iface}" ${slaves[@]} >/dev/null
-	eend $?
-
-	return 0 #important
-}
-
-# bool bonding_stop(void)
-# Unbonds bonded interfaces
-#
-# Always returns 0 (true) 
-bonding_stop() {
-	local iface="$1" slaves s
-
-	# return silently if this is not a bonding interface
-	! bonding_exists "${iface}" && return 0
-
-	# don't trust the config, get the active list instead
-	slaves="$( \
-		sed -n -e 's/^Slave Interface: //p' "/proc/net/bonding/${iface}" \
-		| xargs \
-	)"
-	[[ -z ${slaves} ]] && return 0
-
-	# remove all slaves
-	ebegin "Removing slaves from ${iface}"
-	eindent
-	einfo "${slaves}"
-	eoutdent
-	/sbin/ifenslave -d "${iface}" ${slaves}
-
-	# reset all slaves
-	for s in ${slaves}; do
-		if interface_exists "${s}" ; then
-			interface_del_addresses "${s}"
-			interface_down "${s}"
-		fi
-	done
-
-	eend 0
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/bonding.sh b/net-scripts/net.modules.d/bonding.sh
new file mode 100644
index 0000000..6095c74
--- /dev/null
+++ b/net-scripts/net.modules.d/bonding.sh
@@ -0,0 +1,120 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void bonding_depend(void)
+#
+# Sets up the dependancies for the module
+bonding_depend() {
+	before interface macchanger
+	functions interface_exists interface_up interface_down \
+		interface_del_addresses
+}
+
+# void bonding_expose(void)
+#
+# Expose variables that can be configured
+bonding_expose() {
+	variables slaves
+}
+
+# bool bonding_check_installed(void)
+#
+# Returns 0 if ifenslave is installed, otherwise 1
+bonding_check_installed() {
+	[[ -x /sbin/ifenslave ]] && return 0
+	${1:-false} && eerror "For link aggregation (bonding) support, emerge net-misc/ifenslave"
+	return 1
+}
+
+# bonding_exists(char *interface)
+#
+# Returns 0 if we are a bonded interface, otherwise 1
+bonding_exists() {
+	[[ -f "/proc/net/bonding/$1" ]]
+}
+
+# bool bonding_post_start(char *iface)
+#
+# Bonds the interface
+bonding_pre_start() {
+	local iface="$1" s ifvar="$(bash_variable "$1")"
+	local -a slaves
+
+	slaves="slaves_${ifvar}[@]"
+	[[ -z ${!slaves} ]] && return 0
+	slaves=( "${!slaves}" )
+
+	# Support space seperated slaves
+	[[ ${#slaves[@]} == 1 ]] && slaves=( ${slaves} )
+
+	interface_exists "${iface}" true || return 1
+
+	if ! bonding_exists "${iface}" ; then
+		eerror "${iface} is not capable of bonding"
+		return 1
+	fi
+
+	ebegin "Adding slaves to ${iface}"
+	eindent
+	einfo "${slaves[@]}"
+
+	# Check that our slaves exist
+	for s in "${slaves[@]}" ; do
+		interface_exists "${s}" true || return 1
+	done
+
+	# Must force the slaves to a particular state before adding them
+	for s in "${slaves[@]}" ; do
+		interface_del_addresses "${s}"
+		interface_up "${s}"
+	done
+
+	# now force the master to up
+	interface_up "${iface}"
+
+	# finally add in slaves
+	eoutdent
+	/sbin/ifenslave "${iface}" ${slaves[@]} >/dev/null
+	eend $?
+
+	return 0 #important
+}
+
+# bool bonding_stop(void)
+# Unbonds bonded interfaces
+#
+# Always returns 0 (true) 
+bonding_stop() {
+	local iface="$1" slaves s
+
+	# return silently if this is not a bonding interface
+	! bonding_exists "${iface}" && return 0
+
+	# don't trust the config, get the active list instead
+	slaves="$( \
+		sed -n -e 's/^Slave Interface: //p' "/proc/net/bonding/${iface}" \
+		| xargs \
+	)"
+	[[ -z ${slaves} ]] && return 0
+
+	# remove all slaves
+	ebegin "Removing slaves from ${iface}"
+	eindent
+	einfo "${slaves}"
+	eoutdent
+	/sbin/ifenslave -d "${iface}" ${slaves}
+
+	# reset all slaves
+	for s in ${slaves}; do
+		if interface_exists "${s}" ; then
+			interface_del_addresses "${s}"
+			interface_down "${s}"
+		fi
+	done
+
+	eend 0
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/bridge b/net-scripts/net.modules.d/bridge
deleted file mode 100644
index ec1e2ff..0000000
--- a/net-scripts/net.modules.d/bridge
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Fix any potential localisation problems
-# Note that LC_ALL trumps LC_anything_else according to locale(7)
-brctl() {
-	LC_ALL=C /sbin/brctl "$@"
-}
-# void bridge_depend(void)
-#
-# Sets up the dependancies for the module
-bridge_depend() {
-	before interface macnet
-	functions interface_down interface_del_addresses interface_set_flag
-}
-
-# void bridge_expose(void)
-#
-# Expose variables that can be configured
-bridge_expose() {
-	variables bridge bridge_add brctl
-}
-
-# bool bridge_check_installed(void)
-#
-# Returns 1 if bridge is installed, otherwise 0
-bridge_check_installed() {
-	[[ -x /sbin/brctl ]] && return 0
-	${1:-false} && eerror "For bridge support, emerge net-misc/bridge-utils"
-	return 1
-}
-
-# char* bridge_get_ports(char *interface)
-#
-# Returns the interfaces added to the given bridge
-bridge_get_ports() {
-	brctl show 2>/dev/null \
-		| sed -n -e '/^'"$1"'/,/^\S/ { /^\('"$1"'\|\t\)/s/^.*\t//p }'
-}
-
-# char* bridge_get_bridge(char *interface)
-#
-# Returns the bridge interface of the given interface
-bridge_get_bridge() {
-	local x="$( brctl show 2>/dev/null \
-	| sed -e '1 {d}; /^[^ ]/ { N }; /.*'"$1"'.*/ {s/^\([^ \t]\+\).*/\1/p}; d')"
-
-	local -a a=( ${x} )
-	if [[ ${#a[@]} == "1" ]] ; then
-		echo "${x}"
-	elif [[ $1 == "${a[3]}" ]] ; then
-		echo "${a[0]}"
-	fi
-}
-
-# bool bridge_exists(char *interface)
-#
-# Returns 0 if the bridge exists, otherwise 1
-bridge_exists() {
-	brctl show 2>/dev/null | grep -q "^$1"
-}
-
-# bool bridge_create(char *interface)
-#
-# Creates the bridge - no ports are added here though
-# Returns 0 on success otherwise 1
-bridge_create() {
-	local iface="$1" ifvar="$(bash_variable "$1")" x i opts
-
-	ebegin "Creating bridge ${iface}"
-	x="$(brctl addbr "${iface}" 2>&1)"
-	if [[ -n ${x} ]] ; then
-		if [[ ${x//Package not installed/} != "${x}" ]] ; then
-			eend 1 "Bridging (802.1d) support is not present in this kernel"
-		else
-			eend 1 "${x}"
-		fi
-		return 1
-	fi
-
-	opts="brctl_${ifvar}[@]"
-	for i in "${!opts}" ; do
-		x="${i/ / ${iface} }"
-		[[ ${x} == "${i}" ]] && x="${x} ${iface}"
-		x="$(brctl ${x} 2>&1 1>/dev/null)"
-		[[ -n ${x} ]] && ewarn "${x}"
-	done
-	eend 0
-}
-
-# bool bridge_add_port(char *interface, char *port)
-#
-# Adds the port to the bridge
-bridge_add_port() {
-	local iface="$1" port="$2" e
-
-	interface_set_flag "${port}" promisc true
-	interface_up "${port}"
-	e="$(brctl addif "${iface}" "${port}" 2>&1)"
-	if [[ -n ${e} ]] ; then
-		interface_set_flag "${port}" promisc false
-		echo "${e}" >&2
-		return 1
-	fi
-	return 0
-}
-
-# bool bridge_delete_port(char *interface, char *port)
-#
-# Deletes a port from a bridge
-bridge_delete_port() {
-	interface_set_flag "$2" promisc false
-	brctl delif "$1" "$2"
-}
-
-# bool bridge_start(char *iface)
-#
-# set up bridge
-# This can also be called by non-bridges so that the bridge can be created
-# dynamically
-bridge_pre_start() {
-	local iface="$1" ports briface i ifvar="$(bash_variable "$1")" opts
-	ports="bridge_${ifvar}[@]"
-	briface="bridge_add_${ifvar}"
-	opts="brctl_${ifvar}[@]"
-
-	[[ -z ${!ports} && -z ${!briface} && -z ${!opts} ]] && return 0
-
-	# Destroy the bridge if it exists
-	[[ -n ${!ports} ]] && bridge_stop "${iface}"
-
-	# Allow ourselves to add to the bridge
-	if [[ -z ${!ports} && -n ${!briface} ]] ; then
-		ports="${iface}"
-		iface="${!briface}"
-	else
-		ports="${!ports}"
-	fi
-
-	# Create the bridge if needed
-	bridge_exists "${iface}" || bridge_create "${iface}"
-
-	if [[ -n ${ports} ]] ; then
-		einfo "Adding ports to ${iface}"
-		eindent
-
-		for i in ${ports} ; do
-			interface_exists "${i}" true || return 1 
-		done
-
-		for i in ${ports} ; do
-			ebegin "${i}"
-			bridge_add_port "${iface}" "${i}"
-			eend $? || return 1
-		done
-		eoutdent
-	fi
-
-	return 0
-}
-
-# bool bridge_stop(char *iface)
-#
-# Removes the device
-# returns 0
-bridge_stop() {
-	local iface="$1" ports i deletebridge=false extra=""
-
-	if bridge_exists "${iface}" ; then
-		ebegin "Destroying bridge ${iface}"
-		interface_down "${iface}"
-		ports="$(bridge_get_ports "${iface}")"
-		deletebridge=true
-		eindent
-	else
-		# Work out if we're added to a bridge for removal or not
-		ports="${iface}"
-		iface="$(bridge_get_bridge "${iface}")"
-		[[ -z ${iface} ]] && return 0
-		extra=" from ${iface}"
-	fi
-
-	for i in ${ports} ; do
-		ebegin "Removing port ${i}${extra}"
-		bridge_delete_port "${iface}" "${i}"
-		eend $?
-	done
-
-	if ${deletebridge} ; then
-		eoutdent
-		brctl delbr "${iface}" &>/dev/null
-		eend 0
-	fi
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/bridge.sh b/net-scripts/net.modules.d/bridge.sh
new file mode 100644
index 0000000..ec1e2ff
--- /dev/null
+++ b/net-scripts/net.modules.d/bridge.sh
@@ -0,0 +1,198 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# Fix any potential localisation problems
+# Note that LC_ALL trumps LC_anything_else according to locale(7)
+brctl() {
+	LC_ALL=C /sbin/brctl "$@"
+}
+# void bridge_depend(void)
+#
+# Sets up the dependancies for the module
+bridge_depend() {
+	before interface macnet
+	functions interface_down interface_del_addresses interface_set_flag
+}
+
+# void bridge_expose(void)
+#
+# Expose variables that can be configured
+bridge_expose() {
+	variables bridge bridge_add brctl
+}
+
+# bool bridge_check_installed(void)
+#
+# Returns 1 if bridge is installed, otherwise 0
+bridge_check_installed() {
+	[[ -x /sbin/brctl ]] && return 0
+	${1:-false} && eerror "For bridge support, emerge net-misc/bridge-utils"
+	return 1
+}
+
+# char* bridge_get_ports(char *interface)
+#
+# Returns the interfaces added to the given bridge
+bridge_get_ports() {
+	brctl show 2>/dev/null \
+		| sed -n -e '/^'"$1"'/,/^\S/ { /^\('"$1"'\|\t\)/s/^.*\t//p }'
+}
+
+# char* bridge_get_bridge(char *interface)
+#
+# Returns the bridge interface of the given interface
+bridge_get_bridge() {
+	local x="$( brctl show 2>/dev/null \
+	| sed -e '1 {d}; /^[^ ]/ { N }; /.*'"$1"'.*/ {s/^\([^ \t]\+\).*/\1/p}; d')"
+
+	local -a a=( ${x} )
+	if [[ ${#a[@]} == "1" ]] ; then
+		echo "${x}"
+	elif [[ $1 == "${a[3]}" ]] ; then
+		echo "${a[0]}"
+	fi
+}
+
+# bool bridge_exists(char *interface)
+#
+# Returns 0 if the bridge exists, otherwise 1
+bridge_exists() {
+	brctl show 2>/dev/null | grep -q "^$1"
+}
+
+# bool bridge_create(char *interface)
+#
+# Creates the bridge - no ports are added here though
+# Returns 0 on success otherwise 1
+bridge_create() {
+	local iface="$1" ifvar="$(bash_variable "$1")" x i opts
+
+	ebegin "Creating bridge ${iface}"
+	x="$(brctl addbr "${iface}" 2>&1)"
+	if [[ -n ${x} ]] ; then
+		if [[ ${x//Package not installed/} != "${x}" ]] ; then
+			eend 1 "Bridging (802.1d) support is not present in this kernel"
+		else
+			eend 1 "${x}"
+		fi
+		return 1
+	fi
+
+	opts="brctl_${ifvar}[@]"
+	for i in "${!opts}" ; do
+		x="${i/ / ${iface} }"
+		[[ ${x} == "${i}" ]] && x="${x} ${iface}"
+		x="$(brctl ${x} 2>&1 1>/dev/null)"
+		[[ -n ${x} ]] && ewarn "${x}"
+	done
+	eend 0
+}
+
+# bool bridge_add_port(char *interface, char *port)
+#
+# Adds the port to the bridge
+bridge_add_port() {
+	local iface="$1" port="$2" e
+
+	interface_set_flag "${port}" promisc true
+	interface_up "${port}"
+	e="$(brctl addif "${iface}" "${port}" 2>&1)"
+	if [[ -n ${e} ]] ; then
+		interface_set_flag "${port}" promisc false
+		echo "${e}" >&2
+		return 1
+	fi
+	return 0
+}
+
+# bool bridge_delete_port(char *interface, char *port)
+#
+# Deletes a port from a bridge
+bridge_delete_port() {
+	interface_set_flag "$2" promisc false
+	brctl delif "$1" "$2"
+}
+
+# bool bridge_start(char *iface)
+#
+# set up bridge
+# This can also be called by non-bridges so that the bridge can be created
+# dynamically
+bridge_pre_start() {
+	local iface="$1" ports briface i ifvar="$(bash_variable "$1")" opts
+	ports="bridge_${ifvar}[@]"
+	briface="bridge_add_${ifvar}"
+	opts="brctl_${ifvar}[@]"
+
+	[[ -z ${!ports} && -z ${!briface} && -z ${!opts} ]] && return 0
+
+	# Destroy the bridge if it exists
+	[[ -n ${!ports} ]] && bridge_stop "${iface}"
+
+	# Allow ourselves to add to the bridge
+	if [[ -z ${!ports} && -n ${!briface} ]] ; then
+		ports="${iface}"
+		iface="${!briface}"
+	else
+		ports="${!ports}"
+	fi
+
+	# Create the bridge if needed
+	bridge_exists "${iface}" || bridge_create "${iface}"
+
+	if [[ -n ${ports} ]] ; then
+		einfo "Adding ports to ${iface}"
+		eindent
+
+		for i in ${ports} ; do
+			interface_exists "${i}" true || return 1 
+		done
+
+		for i in ${ports} ; do
+			ebegin "${i}"
+			bridge_add_port "${iface}" "${i}"
+			eend $? || return 1
+		done
+		eoutdent
+	fi
+
+	return 0
+}
+
+# bool bridge_stop(char *iface)
+#
+# Removes the device
+# returns 0
+bridge_stop() {
+	local iface="$1" ports i deletebridge=false extra=""
+
+	if bridge_exists "${iface}" ; then
+		ebegin "Destroying bridge ${iface}"
+		interface_down "${iface}"
+		ports="$(bridge_get_ports "${iface}")"
+		deletebridge=true
+		eindent
+	else
+		# Work out if we're added to a bridge for removal or not
+		ports="${iface}"
+		iface="$(bridge_get_bridge "${iface}")"
+		[[ -z ${iface} ]] && return 0
+		extra=" from ${iface}"
+	fi
+
+	for i in ${ports} ; do
+		ebegin "Removing port ${i}${extra}"
+		bridge_delete_port "${iface}" "${i}"
+		eend $?
+	done
+
+	if ${deletebridge} ; then
+		eoutdent
+		brctl delbr "${iface}" &>/dev/null
+		eend 0
+	fi
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/dhclient b/net-scripts/net.modules.d/dhclient
deleted file mode 100644
index b8d3312..0000000
--- a/net-scripts/net.modules.d/dhclient
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Fix any potential localisation problems
-# Note that LC_ALL trumps LC_anything_else according to locale(7)
-dhclient() {
-	LC_ALL=C /sbin/dhclient "$@"
-}
-
-# void dhclient_depend(void)
-#
-# Sets up the dependancies for the module
-dhclient_depend() {
-	after interface
-	provide dhcp
-	functions interface_exists interface_get_address
-}
-
-# void dhclient_expose(void)
-#
-# Expose variables that can be configured
-dhclient_expose() {
-	variables dhclient dhcp
-}
-
-# bool dhclient_check_installed(void)
-#
-# Returns 1 if dhclient is installed, otherwise 0
-dhclient_check_installed() {
-	[[ -x /sbin/dhclient ]] && return 0
-	${1:-false} && eerror "For DHCP (dhclient) support, emerge net-misc/dhcp"
-	return 1
-}
-
-# bool dhclient_stop(char *iface)
-#
-# Stop dhclient on an interface
-# Always returns 0
-dhclient_stop() {
-	local iface="$1" pidfile="/var/run/dhclient-$1.pid"
-
-	[[ ! -f ${pidfile} ]] && return 0
-
-	ebegin "Stopping dhclient on ${iface}"
-
-	local ifvar="$(bash_variable "${iface}")"
-	local d="dhcp_${ifvar}"
-	d=" ${!d} "
-	[[ ${d} == "  " ]] && d=" ${dhcp} "
-
-	if [[ ${d} == *" release "* ]] ; then
-		local dhconf="interface \"${iface}\" {\n \
-			script \"${MODULES_DIR}/helpers.d/dhclient-wrapper\";\n \
-			}\n"
-		local r="$(echo -e "${dhconf}" \
-			| dhclient -q -r -pf "${pidfile}" "${iface}" )"
-		[[ ${r} == "deconfig" ]]
-		eend $? "dhclient returned ${r}"
-	else
-		start-stop-daemon --stop --exec /sbin/dhclient --pidfile "${pidfile}"
-		eend $?
-	fi
-}
-
-# bool dhclient_start(char *iface)
-#
-# Start DHCP on an interface by calling dhclient $iface $options
-#
-# Returns 0 (true) when a DHCP address is obtained, otherwise 1
-dhclient_start() {
-	local iface="$1" ifvar="$(bash_variable "$1")"
-	local pidfile="/var/run/dhclient-${iface}.pid"
-	local cffile="/etc/dhcp/dhclient.conf"
-
-	interface_exists "${iface}" true || return 1
-
-	# Load any dhclient.conf instructions specified by the user
-	local opts="dhclient_conf_${ifvar}"
-	local dhconf="${!opts}"
-	
-	# Load our options
-	opts="dhclient_${ifvar}"
-	opts="${!opts}"
-
-	# Work out our cffile
-	local x="${opts##* -cf }"
-	if [[ ${x} != "${opts}" ]]; then
-		x="${x%% *}"
-		if [[ -n ${x} ]]; then
-			cffile="${x}"
-			opts="${opts//-cf ${cffile}/}"
-		fi
-	fi
-
-	# Warn that we're going to override parts of their cffile
-	if [[ -e ${cffile} ]] ; then
-		opts="${opts} -cf ${cffile}"
-		if grep -q "^[ \t]*script[ \t]" "${cffile}" ; then
-			ewarn "The script specified in ${cffile} will not be used"
-		fi
-	fi
-
-	local d="dhcp_${ifvar}"
-	d=" ${!d} "
-	[[ ${d} == "  " ]] && d=" ${dhcp} "
-
-	local ah=""
-	# Send our hostname by editing cffile
-	if [[ ${d} != *" nosendhost "* ]] ; then
-		local hname="$(hostname)"
-		if [[ ${hname} != "(none)" && ${hname} != "localhost" ]]; then
-			ah="send host-name \"${hname}\"\n;"
-			# Warn that we're going to override parts of their cffile
-			if [[ -e ${cffile} ]] ; then
-				if grep -q "^[ \t]*send[ \t]*host-name[ \t]" "${cffile}" ; then
-					ewarn "The host-name \"${hname}\" will be sent instead of"
-					ewarn "the one specified in ${cffile}"
-					vewarn "Set dhcp_${ifvar}=\"nosendhost\" in /etc/conf.d/net"
-					vewarn "to stop this from happening"
-				fi
-			fi
-		fi
-	fi
-	dhconf="${dhconf} interface \"${iface}\" {\n \
-		script \"/${MODULES_DIR}/helpers.d/dhclient-wrapper\";\n \
-		 ${ah}
-	 	}" 
-
-	# Bring up DHCP for this interface (or alias)
-	ebegin "Running dhclient"
-	x="$(echo -e "${dhconf}" | dhclient ${opts} -q -1 -pf "${pidfile}")"
-	# We just check the last 5 letters
-	[[ ${x:${#x} - 5:5} == "bound" ]]
-	if [[ $? != "0" ]]; then
-		# Kill the offending daemon as it likes to hang around
-		start-stop-daemon --stop --exec /sbin/dhclient --pidfile "${pidfile}"
-		eend 1 "${x}"
-		return 1
-	fi
-	eend 0
-
-	# DHCP succeeded, show address retrieved
-	local addr="$(interface_get_address "${iface}")"
-	einfo "${iface} received address ${addr}"
-
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/dhclient.sh b/net-scripts/net.modules.d/dhclient.sh
new file mode 100644
index 0000000..b8d3312
--- /dev/null
+++ b/net-scripts/net.modules.d/dhclient.sh
@@ -0,0 +1,150 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# Fix any potential localisation problems
+# Note that LC_ALL trumps LC_anything_else according to locale(7)
+dhclient() {
+	LC_ALL=C /sbin/dhclient "$@"
+}
+
+# void dhclient_depend(void)
+#
+# Sets up the dependancies for the module
+dhclient_depend() {
+	after interface
+	provide dhcp
+	functions interface_exists interface_get_address
+}
+
+# void dhclient_expose(void)
+#
+# Expose variables that can be configured
+dhclient_expose() {
+	variables dhclient dhcp
+}
+
+# bool dhclient_check_installed(void)
+#
+# Returns 1 if dhclient is installed, otherwise 0
+dhclient_check_installed() {
+	[[ -x /sbin/dhclient ]] && return 0
+	${1:-false} && eerror "For DHCP (dhclient) support, emerge net-misc/dhcp"
+	return 1
+}
+
+# bool dhclient_stop(char *iface)
+#
+# Stop dhclient on an interface
+# Always returns 0
+dhclient_stop() {
+	local iface="$1" pidfile="/var/run/dhclient-$1.pid"
+
+	[[ ! -f ${pidfile} ]] && return 0
+
+	ebegin "Stopping dhclient on ${iface}"
+
+	local ifvar="$(bash_variable "${iface}")"
+	local d="dhcp_${ifvar}"
+	d=" ${!d} "
+	[[ ${d} == "  " ]] && d=" ${dhcp} "
+
+	if [[ ${d} == *" release "* ]] ; then
+		local dhconf="interface \"${iface}\" {\n \
+			script \"${MODULES_DIR}/helpers.d/dhclient-wrapper\";\n \
+			}\n"
+		local r="$(echo -e "${dhconf}" \
+			| dhclient -q -r -pf "${pidfile}" "${iface}" )"
+		[[ ${r} == "deconfig" ]]
+		eend $? "dhclient returned ${r}"
+	else
+		start-stop-daemon --stop --exec /sbin/dhclient --pidfile "${pidfile}"
+		eend $?
+	fi
+}
+
+# bool dhclient_start(char *iface)
+#
+# Start DHCP on an interface by calling dhclient $iface $options
+#
+# Returns 0 (true) when a DHCP address is obtained, otherwise 1
+dhclient_start() {
+	local iface="$1" ifvar="$(bash_variable "$1")"
+	local pidfile="/var/run/dhclient-${iface}.pid"
+	local cffile="/etc/dhcp/dhclient.conf"
+
+	interface_exists "${iface}" true || return 1
+
+	# Load any dhclient.conf instructions specified by the user
+	local opts="dhclient_conf_${ifvar}"
+	local dhconf="${!opts}"
+	
+	# Load our options
+	opts="dhclient_${ifvar}"
+	opts="${!opts}"
+
+	# Work out our cffile
+	local x="${opts##* -cf }"
+	if [[ ${x} != "${opts}" ]]; then
+		x="${x%% *}"
+		if [[ -n ${x} ]]; then
+			cffile="${x}"
+			opts="${opts//-cf ${cffile}/}"
+		fi
+	fi
+
+	# Warn that we're going to override parts of their cffile
+	if [[ -e ${cffile} ]] ; then
+		opts="${opts} -cf ${cffile}"
+		if grep -q "^[ \t]*script[ \t]" "${cffile}" ; then
+			ewarn "The script specified in ${cffile} will not be used"
+		fi
+	fi
+
+	local d="dhcp_${ifvar}"
+	d=" ${!d} "
+	[[ ${d} == "  " ]] && d=" ${dhcp} "
+
+	local ah=""
+	# Send our hostname by editing cffile
+	if [[ ${d} != *" nosendhost "* ]] ; then
+		local hname="$(hostname)"
+		if [[ ${hname} != "(none)" && ${hname} != "localhost" ]]; then
+			ah="send host-name \"${hname}\"\n;"
+			# Warn that we're going to override parts of their cffile
+			if [[ -e ${cffile} ]] ; then
+				if grep -q "^[ \t]*send[ \t]*host-name[ \t]" "${cffile}" ; then
+					ewarn "The host-name \"${hname}\" will be sent instead of"
+					ewarn "the one specified in ${cffile}"
+					vewarn "Set dhcp_${ifvar}=\"nosendhost\" in /etc/conf.d/net"
+					vewarn "to stop this from happening"
+				fi
+			fi
+		fi
+	fi
+	dhconf="${dhconf} interface \"${iface}\" {\n \
+		script \"/${MODULES_DIR}/helpers.d/dhclient-wrapper\";\n \
+		 ${ah}
+	 	}" 
+
+	# Bring up DHCP for this interface (or alias)
+	ebegin "Running dhclient"
+	x="$(echo -e "${dhconf}" | dhclient ${opts} -q -1 -pf "${pidfile}")"
+	# We just check the last 5 letters
+	[[ ${x:${#x} - 5:5} == "bound" ]]
+	if [[ $? != "0" ]]; then
+		# Kill the offending daemon as it likes to hang around
+		start-stop-daemon --stop --exec /sbin/dhclient --pidfile "${pidfile}"
+		eend 1 "${x}"
+		return 1
+	fi
+	eend 0
+
+	# DHCP succeeded, show address retrieved
+	local addr="$(interface_get_address "${iface}")"
+	einfo "${iface} received address ${addr}"
+
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/dhcpcd b/net-scripts/net.modules.d/dhcpcd
deleted file mode 100644
index 516f7e3..0000000
--- a/net-scripts/net.modules.d/dhcpcd
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void dhcpcd_depend(void)
-#
-# Sets up the dependancies for the module
-dhcpcd_depend() {
-	after interface
-	provide dhcp
-	functions interface_exists interface_get_address
-}
-
-# void dhcpcd_expose(void)
-#
-# Expose variables that can be configured
-dhcpcd_expose() {
-	variables dhcpcd dhcp
-}
-
-# bool dhcpcd_check_installed(void)
-#
-# Returns 1 if dhcpcd is installed, otherwise 0
-dhcpcd_check_installed() {
-	if [[ -x /sbin/dhcpcd ]]; then
-		if dhcpcd -h 2>&1 | grep -q "etcDir" ; then
-			return 0
-		else
-			${1:-false} && eerror "We require dhcpcd-2.0.0 or newer"
-			return 1
-		fi
-	fi
-
-	${1:-false} && eerror "For DHCP (dhcpcd) support, emerge net-misc/dhcpcd"
-	return 1
-}
-
-# bool dhcpcd_stop(char *iface)
-#
-# Stop DHCP on an interface by calling dhcpcd -z $iface
-#
-# Returns 0 (true) when a DHCP address dropped
-# otherwise return 1
-dhcpcd_stop() {
-	local iface=$1 signal pidfile="/var/run/dhcpcd-$1.pid" d
-
-	[[ ! -f ${pidfile} ]] && return 0
-
-	ebegin "Stopping dhcpcd on ${iface}"
-	
-	local ifvar="$(bash_variable "${iface}")"
-	d="dhcp_${ifvar}"
-	d=" ${!d} "
-	[[ ${d} == "  " ]] && d=" ${dhcp} "
-
-	if [[ ${d} == *" release "* ]] ; then
-		/sbin/dhcpcd -k "${iface}"
-	else
-		start-stop-daemon --stop --exec /sbin/dhcpcd --pidfile "${pidfile}"
-	fi
-	eend $? "timed out"
-}
-
-# bool dhcpcd_start(char *iface)
-#
-# Start DHCP on an interface by calling dhcpcd $iface $options
-#
-# Returns 0 (true) when a DHCP address is obtained, otherwise 1
-dhcpcd_start() {
-	local iface="$1" opts pidfile="/var/run/dhcpcd-$1.pid"
-	local ifvar="$(bash_variable "${iface}")" metric d
-
-	interface_exists "${iface}" true || return 1
-
-	# Get our options
-	opts="dhcpcd_${ifvar}"
-	opts="${!opts}"
-
-	# Map some generic options to dhcpcd
-	d="dhcp_${ifvar}"
-	d=" ${!d} "
-	[[ ${d} == "  " ]] && d=" ${dhcp} "
-	[[ ${d} == *" nodns "* ]] && opts="${opts} -R"
-	[[ ${d} == *" nontp "* ]] && opts="${opts} -N"
-	[[ ${d} == *" nonis "* ]] && opts="${opts} -Y"
-	[[ ${d} == *" nogateway "* ]] && opts="${opts} -G"
-
-	# We transmit the hostname by default:q
-	if [[ " ${d} " != *" nosendhost "* && " ${opts} " != *" -h "* ]]; then
-		local hname="$(hostname)"
-		[[ -n ${hname} && ${hname} != "(none)" && ${hname} != "localhost" ]] \
-			&& opts="-h \"${hname}\" ${opts}"
-	fi
-
-	# Stop dhcpcd from bringing the interface down when we exit
-	opts="${opts} -o"
-
-	# Add our route metric
-	metric="metric_${ifvar}"
-	[[ -n ${!metric} && ${!metric} != "0" ]] && opts="${opts} -m ${!metric}"
-
-	# Instruct dhcpcd to use our wrapper 
-	opts="${opts} -c \"${svclib}/net.modules.d/helpers.d/dhcpcd-wrapper\""
-
-	# Instruct dhcpcd to create it's files in our state dir
-	opts="${opts} -e \"${statedir}/${iface}\""
-
-	# Bring up DHCP for this interface (or alias)
-	ebegin "Running dhcpcd"
-
-	[[ ! -d "${statedir}/${iface}" ]] && mkdir -m 0755 -p "${statedir}/${iface}"
-	eval /sbin/dhcpcd "${opts}" "${iface}"
-	eend $? || return 1
-
-	# DHCP succeeded, show address retrieved
-	local addr="$( interface_get_address "${iface}" )"
-	einfo "${iface} received address ${addr}"
-
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/dhcpcd.sh b/net-scripts/net.modules.d/dhcpcd.sh
new file mode 100644
index 0000000..516f7e3
--- /dev/null
+++ b/net-scripts/net.modules.d/dhcpcd.sh
@@ -0,0 +1,123 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void dhcpcd_depend(void)
+#
+# Sets up the dependancies for the module
+dhcpcd_depend() {
+	after interface
+	provide dhcp
+	functions interface_exists interface_get_address
+}
+
+# void dhcpcd_expose(void)
+#
+# Expose variables that can be configured
+dhcpcd_expose() {
+	variables dhcpcd dhcp
+}
+
+# bool dhcpcd_check_installed(void)
+#
+# Returns 1 if dhcpcd is installed, otherwise 0
+dhcpcd_check_installed() {
+	if [[ -x /sbin/dhcpcd ]]; then
+		if dhcpcd -h 2>&1 | grep -q "etcDir" ; then
+			return 0
+		else
+			${1:-false} && eerror "We require dhcpcd-2.0.0 or newer"
+			return 1
+		fi
+	fi
+
+	${1:-false} && eerror "For DHCP (dhcpcd) support, emerge net-misc/dhcpcd"
+	return 1
+}
+
+# bool dhcpcd_stop(char *iface)
+#
+# Stop DHCP on an interface by calling dhcpcd -z $iface
+#
+# Returns 0 (true) when a DHCP address dropped
+# otherwise return 1
+dhcpcd_stop() {
+	local iface=$1 signal pidfile="/var/run/dhcpcd-$1.pid" d
+
+	[[ ! -f ${pidfile} ]] && return 0
+
+	ebegin "Stopping dhcpcd on ${iface}"
+	
+	local ifvar="$(bash_variable "${iface}")"
+	d="dhcp_${ifvar}"
+	d=" ${!d} "
+	[[ ${d} == "  " ]] && d=" ${dhcp} "
+
+	if [[ ${d} == *" release "* ]] ; then
+		/sbin/dhcpcd -k "${iface}"
+	else
+		start-stop-daemon --stop --exec /sbin/dhcpcd --pidfile "${pidfile}"
+	fi
+	eend $? "timed out"
+}
+
+# bool dhcpcd_start(char *iface)
+#
+# Start DHCP on an interface by calling dhcpcd $iface $options
+#
+# Returns 0 (true) when a DHCP address is obtained, otherwise 1
+dhcpcd_start() {
+	local iface="$1" opts pidfile="/var/run/dhcpcd-$1.pid"
+	local ifvar="$(bash_variable "${iface}")" metric d
+
+	interface_exists "${iface}" true || return 1
+
+	# Get our options
+	opts="dhcpcd_${ifvar}"
+	opts="${!opts}"
+
+	# Map some generic options to dhcpcd
+	d="dhcp_${ifvar}"
+	d=" ${!d} "
+	[[ ${d} == "  " ]] && d=" ${dhcp} "
+	[[ ${d} == *" nodns "* ]] && opts="${opts} -R"
+	[[ ${d} == *" nontp "* ]] && opts="${opts} -N"
+	[[ ${d} == *" nonis "* ]] && opts="${opts} -Y"
+	[[ ${d} == *" nogateway "* ]] && opts="${opts} -G"
+
+	# We transmit the hostname by default:q
+	if [[ " ${d} " != *" nosendhost "* && " ${opts} " != *" -h "* ]]; then
+		local hname="$(hostname)"
+		[[ -n ${hname} && ${hname} != "(none)" && ${hname} != "localhost" ]] \
+			&& opts="-h \"${hname}\" ${opts}"
+	fi
+
+	# Stop dhcpcd from bringing the interface down when we exit
+	opts="${opts} -o"
+
+	# Add our route metric
+	metric="metric_${ifvar}"
+	[[ -n ${!metric} && ${!metric} != "0" ]] && opts="${opts} -m ${!metric}"
+
+	# Instruct dhcpcd to use our wrapper 
+	opts="${opts} -c \"${svclib}/net.modules.d/helpers.d/dhcpcd-wrapper\""
+
+	# Instruct dhcpcd to create it's files in our state dir
+	opts="${opts} -e \"${statedir}/${iface}\""
+
+	# Bring up DHCP for this interface (or alias)
+	ebegin "Running dhcpcd"
+
+	[[ ! -d "${statedir}/${iface}" ]] && mkdir -m 0755 -p "${statedir}/${iface}"
+	eval /sbin/dhcpcd "${opts}" "${iface}"
+	eend $? || return 1
+
+	# DHCP succeeded, show address retrieved
+	local addr="$( interface_get_address "${iface}" )"
+	einfo "${iface} received address ${addr}"
+
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/essidnet b/net-scripts/net.modules.d/essidnet
deleted file mode 100644
index 69e2db5..0000000
--- a/net-scripts/net.modules.d/essidnet
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-# Many thanks to all the people in the Gentoo forums for their ideas and
-# motivation for me to make this and keep on improving it
-
-# Load our config if it exists
-[[ -f "$(add_suffix "/etc/conf.d/wireless" )" ]] \
-	&& source "$(add_suffix "/etc/conf.d/wireless" )"
-
-# void essidnet_depend(void)
-#
-# Sets up the dependancies for the module
-essidnet_depend() {
-	before interface system
-	after wireless
-	installed wireless
-	functions wireless_exists wireless_get_essid wireless_get_ap_mac_address
-}
-
-# bool essidnet_start(char *iface)
-#
-# All interfaces and module scripts can depend on the variables function
-# which returns a space seperated list of user configuration variables
-# We can override each variable here from a given ESSID or the MAC
-# of the AP connected to. MAC configuration takes precedence
-# Always returns 0
-essidnet_pre_start() {
-	local iface="$1"
-
-	wireless_exists "${iface}" || return 0
-
-	local mac="$(wireless_get_ap_mac_address "${iface}")"
-	local ESSID="$(wireless_get_essid "${iface}")"
-	local essid="$(bash_variable "${ESSID}")"
-	mac="${mac//:/}"
-
-	vebegin "Configuring ${iface} for ESSID \"${ESSID//\\\\/\\\\}\"" 2>/dev/null
-	configure_variables "${iface}" "${essid}" "${mac}"
-
-	# Backwards compat for old gateway var
-	x="gateway_${essid}"
-	[[ -n ${!x} ]] && gateway="${iface}/${!x}"
-
-	veend 0 2>/dev/null
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/essidnet.sh b/net-scripts/net.modules.d/essidnet.sh
new file mode 100644
index 0000000..69e2db5
--- /dev/null
+++ b/net-scripts/net.modules.d/essidnet.sh
@@ -0,0 +1,49 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+# Many thanks to all the people in the Gentoo forums for their ideas and
+# motivation for me to make this and keep on improving it
+
+# Load our config if it exists
+[[ -f "$(add_suffix "/etc/conf.d/wireless" )" ]] \
+	&& source "$(add_suffix "/etc/conf.d/wireless" )"
+
+# void essidnet_depend(void)
+#
+# Sets up the dependancies for the module
+essidnet_depend() {
+	before interface system
+	after wireless
+	installed wireless
+	functions wireless_exists wireless_get_essid wireless_get_ap_mac_address
+}
+
+# bool essidnet_start(char *iface)
+#
+# All interfaces and module scripts can depend on the variables function
+# which returns a space seperated list of user configuration variables
+# We can override each variable here from a given ESSID or the MAC
+# of the AP connected to. MAC configuration takes precedence
+# Always returns 0
+essidnet_pre_start() {
+	local iface="$1"
+
+	wireless_exists "${iface}" || return 0
+
+	local mac="$(wireless_get_ap_mac_address "${iface}")"
+	local ESSID="$(wireless_get_essid "${iface}")"
+	local essid="$(bash_variable "${ESSID}")"
+	mac="${mac//:/}"
+
+	vebegin "Configuring ${iface} for ESSID \"${ESSID//\\\\/\\\\}\"" 2>/dev/null
+	configure_variables "${iface}" "${essid}" "${mac}"
+
+	# Backwards compat for old gateway var
+	x="gateway_${essid}"
+	[[ -n ${!x} ]] && gateway="${iface}/${!x}"
+
+	veend 0 2>/dev/null
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/ifconfig b/net-scripts/net.modules.d/ifconfig
deleted file mode 100644
index bec988e..0000000
--- a/net-scripts/net.modules.d/ifconfig
+++ /dev/null
@@ -1,453 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Fix any potential localisation problems
-# Note that LC_ALL trumps LC_anything_else according to locale(7)
-ifconfig() {
-	LC_ALL=C /sbin/ifconfig "$@"
-}
-
-ifconfig_tunnel() {
-	LC_ALL=C /sbin/iptunnel "$@"
-}
-
-route() {
-	LC_ALL=C /sbin/route "$@"
-}
-
-# void ifconfig_depend(void)
-#
-# Sets up the dependancies for the module
-ifconfig_depend() {
-	provide interface
-}
-
-# void ifconfig_expose(void)
-#
-# Expose variables that can be configured
-ifconfig_expose() {
-	variables config routes fallback metric ifconfig \
-		ifconfig_fallback routes inet6 iface alias broadcast netmask
-}
-
-# bool ifconfig_check_installed(void)
-#
-# Returns 1 if ifconfig is installed, otherwise 0
-ifconfig_check_installed() {
-	[[ -x /sbin/ifconfig ]] && return 0
-	${1:-false} && eerror "For ifconfig support, emerge sys-apps/net-tools"
-	return 1
-}
-
-# bool ifconfig_exists(char *interface, bool report)
-#
-# Returns 1 if the interface exists, otherwise 0
-ifconfig_exists() {
-	local e="$(ifconfig -a | grep -o "^$1")" report="${2:-false}"
-	[[ -n ${e} ]] && return 0
-
-	if ${report} ; then
-		eerror "network interface $1 does not exist"
-		eerror "Please verify hardware or kernel module (driver)"
-	fi
-
-	return 1
-}
-
-# void ifconfig_up(char *iface)
-#
-# provides a generic interface for bringing interfaces up
-ifconfig_up() {
-	ifconfig "$1" up
-}
-
-# void ifconfig_down(char *iface)
-#
-# provides a generic interface for bringing interfaces down
-ifconfig_down() {
-	ifconfig "$1" down
-}
-
-# bool ifconfig_is_up(char *iface, bool withaddress)
-#
-# Returns 0 if the interface is up, otherwise 1
-# If withaddress is true then the interface has to have an IPv4 address
-# assigned as well
-ifconfig_is_up() {
-	local check="\<UP\>" addr="${2:-false}"
-	${addr} && check="\<inet addr:.*${check}"
-	ifconfig "$1" | grep -Eq "${check}" && return 0
-	return 1
-}
-
-# void ifconfig_set_flag(char *iface, char *flag, bool enabled)
-#
-# Sets or disables the interface flag 
-ifconfig_set_flag() {
-	local iface="$1" flag="$2" enable="$3"
-	${enable} || flag="-${flag}"
-	ifconfig "${iface}" "${flag}"
-}
-
-# void ifconfig_get_address(char *interface)
-#
-# Fetch the address retrieved by DHCP.  If successful, echoes the
-# address on stdout, otherwise echoes nothing.
-ifconfig_get_address() {
-	local -a x=( $( ifconfig "$1" \
-	| sed -n -e 's/.*inet addr:\([^ ]*\).*Mask:\([^ ]*\).*/\1 \2/p' ) )
-	x[1]="$(netmask2cidr "${x[1]}")"
-	[[ -n ${x[0]} ]] && echo "${x[0]}/${x[1]}"
-}
-
-# bool ifconfig_is_ethernet(char *interface)
-#
-# Return 0 if the link is ethernet, otherwise 1.
-ifconfig_is_ethernet() {
-	ifconfig "$1" | grep -q "^$1[[:space:]]*Link encap:Ethernet[[:space:]]"
-}
-
-# void ifconfig_get_mac_address(char *interface)
-#
-# Fetch the mac address assingned to the network card
-ifconfig_get_mac_address() {
-	local mac="$(ifconfig "$1" | sed -n -e \
-		's/.*HWaddr[ \t]*\<\(..:..:..:..:..:..\)\>.*/\U\1/p')"
-	[[ ${mac} != '00:00:00:00:00:00' \
-	&& ${mac} != '44:44:44:44:44:44' \
-	&& ${mac} != 'FF:FF:FF:FF:FF:FF' ]] \
-		&& echo "${mac}"
-}
-
-# void ifconfig_set_mac_address(char *interface, char *mac)
-#
-# Assigned the mac address to the network card
-ifconfig_set_mac_address() {
-	ifconfig "$1" hw ether "$2"
-}
-
-# int ifconfig_set_name(char *interface, char *new_name)
-#
-# Renames the interface
-# This will not work if the interface is setup!
-ifconfig_set_name() {
-	[[ -z $2 ]] && return 1
-	local current="$1" new="$2"
-
-	local mac="$(ifconfig_get_mac_address "${current}")"
-	if [[ -z ${mac} ]]; then
-		eerror "${iface} does not have a MAC address"
-		return 1
-	fi
-
-	/sbin/nameif "${new}" "${mac}"
-}
-
-# void ifconfig_get_aliases_rev(char *interface)
-#
-# Fetch the list of aliases for an interface.  
-# Outputs a space-separated list on stdout, in reverse order, for
-# example "eth0:2 eth0:1"
-ifconfig_get_aliases_rev() {
-	ifconfig | grep -o "^$1:[0-9]* " | tac
-}
-
-# bool ifconfig_del_addresses(char *interface, bool onlyinet)
-#
-# Remove addresses from interface.  Returns 0 (true) if there
-# were addresses to remove (whether successful or not).  Returns 1
-# (false) if there were no addresses to remove.
-# If onlyinet is true then we only delete IPv4 / inet addresses
-ifconfig_del_addresses() {
-	local iface="$1" i onlyinet="${2:-false}"
-	# We don't remove addresses from aliases
-	[[ ${iface} == *:* ]] && return 0
-
-	# If the interface doesn't exist, don't try and delete
-	ifconfig_exists "${iface}" || return 0
-
-	# iproute2 can add many addresses to an iface unlike ifconfig ...
-	# iproute2 added addresses cause problems for ifconfig
-	# as we delete an address, a new one appears, so we have to
-	# keep polling
-	while ifconfig "${iface}" | grep -q -m1 -o 'inet addr:[^ ]*' ; do
-		ifconfig "${iface}" 0.0.0.0 || break
-	done
-
-	# Remove IPv6 addresses
-	if ! ${onlyinet} ; then
-		for i in $( ifconfig "${iface}" \
-			| sed -n -e 's/^.*inet6 addr: \([^ ]*\) Scope:[^L].*/\1/p' ) ; do
-			/sbin/ifconfig "${iface}" inet6 del "${i}"
-		done
-	fi
-	return 0
-}
-
-# bool ifconfig_get_old_config(char *iface)
-#
-# Returns config and config_fallback for the given interface
-ifconfig_get_old_config() {
-	local iface="$1" ifvar="$(bash_variable "$1")" i inet6
-
-	config="ifconfig_${ifvar}[@]"
-	config=( "${!config}" )
-	config_fallback="ifconfig_fallback_${ifvar}[@]"
-	config_fallback=( "${!config_fallback}" )
-	inet6="inet6_${ifvar}[@]"
-	inet6=( "${!inet6}" )
-
-	# BACKWARD COMPATIBILITY: populate the config_IFACE array
-	# if iface_IFACE is set (fex. iface_eth0 instead of ifconfig_eth0)
-	i="iface_${ifvar}"
-	if [[ -n ${!i} && -z ${config} ]]; then
-		# Make sure these get evaluated as arrays
-		local -a aliases broadcasts netmasks
-
-		# Start with the primary interface
-		config=( ${!i} )
-
-		# ..then add aliases
-		aliases="alias_${ifvars}"
-		aliases=( ${!aliases} )
-		broadcasts="broadcast_${ifvar}"
-		broadcasts=( ${!broadcasts} )
-		netmasks="netmask_${ifvar}"
-		netmasks=( ${!netmasks} )
-		for (( i=0; i<${#aliases[@]}; i++ )); do
-			config[i+1]="${aliases[i]} ${broadcasts[i]:+broadcast ${broadcasts[i]}} ${netmasks[i]:+netmask ${netmasks[i]}}"
-		done
-	fi
-
-	# BACKWARD COMPATIBILITY: check for space-separated inet6 addresses
-	[[ ${#inet6[@]} == 1 && ${inet6} == *' '* ]] &&  inet6=( ${inet6} )
-
-	# Add inet6 addresses to our config if required
-	[[ -n ${inet6} ]] && config=( "${config[@]}" "${inet6[@]}" )
-
-	return 0
-}
-
-# bool ifconfig_iface_stop(char *interface)
-#
-# Do final shutdown for an interface or alias.
-#
-# Returns 0 (true) when successful, non-zero (false) on failure
-ifconfig_iface_stop() {
-	# If an alias is already down, then "ifconfig eth0:1 down"
-	# will try to bring it up with an address of "down" which
-	# fails.  Do some double-checking before returning error
-	# status
-	ifconfig_is_up "$1" || return 0
-	ifconfig_down "$1" && return 0
-
-	# It is sometimes impossible to transition an alias from the
-	# UP state... particularly if the alias has no address.  So
-	# ignore the failure, which should be okay since the entire
-	# interface will be shut down eventually.
-	[[ $1 == *:* ]] && return 0
-	return 1
-}
-
-# bool ifconfig_pre_start(char *interface)
-#
-# Runs any pre_start stuff on our interface - just the MTU atm
-# We set MTU twice as it may be needed for DHCP - a dhcp client could
-# change it in error, so we set MTU in post start too
-ifconfig_pre_start() {
-	local iface="$1"
-
-	interface_exists "${iface}" || return 0
-
-	local ifvar="$(bash_variable "$1")" mtu
-
-	# MTU support
-	mtu="mtu_${ifvar}"
-	[[ -n ${!mtu} ]] && ifconfig "${iface}" mtu "${!mtu}"
-
-	return 0
-}
-
-
-# bool ifconfig_post_start(char *iface)
-#
-# Bring up iface using ifconfig utilities, called from iface_start
-#
-# Returns 0 (true) when successful on the primary interface, non-zero
-# (false) when the primary interface fails.  Aliases are allowed to
-# fail, the routine should still return success to indicate that
-# net.eth0 was successful
-ifconfig_post_start() {
-	local iface="$1" ifvar="$(bash_variable "$1")" routes x metric mtu cidr
-	metric="metric_${ifvar}"
-
-	ifconfig_exists "${iface}" || return 0
-	
-	# Make sure interface is marked UP
-	ifconfig_up "${iface}"
-
-	# MTU support
-	mtu="mtu_${ifvar}"
-	[[ -n ${!mtu} ]] && ifconfig "${iface}" mtu "${!mtu}"
-
-	routes="routes_${ifvar}[@]"
-	routes=( "${!routes}" )
-
-	# BACKWARD COMPATIBILITY: set the default gateway
-	if [[ ${gateway} == "${iface}/"* ]]; then
-		# We don't add the old gateway if one has been set in routes_IFACE
-		local gw=true
-		for x in "${routes[@]}"; do
-			[[ ${x} != *"default gw"* ]] && continue
-			gw=false
-			break
-		done
-		${gw} && routes=( "${routes[@]}" "default gw ${gateway#*/}" )
-	fi
-
-	[[ -z ${routes} ]] && return 0
-
-	# Add routes for this interface, might even include default gw
-	einfo "Adding routes"
-	eindent
-	for x in "${routes[@]}"; do
-		ebegin "${x}"
-
-		# Support iproute2 style routes
-		x="${x//via/gw} "
-		x="${x//scope * / }"
-
-		# Assume we're a net device unless told otherwise
-		[[ " ${x} " != *" -net "* && " ${x} " != *" -host "* ]] && x="-net ${x}"
-
-		# Support adding IPv6 addresses easily
-		if [[ ${x} == *:* ]]; then
-			[[ ${x} != *"-A inet6"* ]] && x="-A inet6 ${x}"
-			x="${x// -net / }"
-		fi
-
-		# Add a metric if we don't have one
-		[[ ${x} != *" metric "* ]] && x="${x} metric ${!metric}"
-
-		route add ${x} dev "${iface}"
-		eend $?
-	done
-	eoutdent
-
-	return 0
-}
-
-# bool ifconfig_add_address(char *iface, char *options ...)
-#
-# Adds the given address to the interface
-ifconfig_add_address() {
-	local iface="$1" i=0 r e real_iface="$(interface_device "$1")"
-
-	ifconfig_exists "${real_iface}" true || return 1
-	
-	# Extract the config
-	local -a config=( "$@" )
-	config=( ${config[@]:1} )
-
-	if [[ ${config[0]} == *:* ]]; then
-		# Support IPv6 - nice and simple
-		config[0]="inet6 add ${config[0]}"
-	else
-		# IPv4 is tricky - ifconfig requires an aliased device
-		# for multiple addresses
-		if ifconfig "${iface}" | grep -Eq "\<inet addr:.*" ; then
-			# Get the last alias made for the interface and add 1 to it
-			i="$(ifconfig | tac | grep -m 1 -o "^${iface}:[0-9]*" \
-				| sed -n -e 's/'"${iface}"'://p')"
-			i="${i:-0}"
-			(( i++ ))
-			iface="${iface}:${i}"
-		fi
-
-		# ifconfig doesn't like CIDR addresses
-		local ip="${config[0]%%/*}" cidr="${config[0]##*/}" netmask
-		if [[ -n ${cidr} && ${cidr} != "${ip}" ]]; then
-			netmask="$(cidr2netmask "${cidr}")"
-			config[0]="${ip} netmask ${netmask}"
-		fi	
-
-		# Support iproute2 style config where possible
-		r="${config[@]}"
-		config=( ${r//brd +/} )
-		config=( "${config[@]//brd/broadcast}" )
-		config=( "${config[@]//peer/pointopoint}" )
-	fi
-
-	# Ensure that the interface is up so we can add IPv6 addresses
-	interface_up "${real_iface}"
-
-	# Some kernels like to apply lo with an address when they are brought up
-	if [[ ${iface} == "lo" && ${config[@]} == "127.0.0.1 netmask 255.0.0.0 broadcast 127.255.255.255" ]]; then
-		ifconfig "${iface}" 0.0.0.0
-	fi
-
-	ifconfig "${iface}" ${config[@]}
-	r="$?"
-	[[ ${r} != "0" ]] && return ${r}
-
-	local metric ifvar="$(bash_variable "${real_iface}")"
-	# Remove the newly added route and replace with our metric
-	metric="metric_${ifvar}"
-	[[ ${!metric:-0} == "0" ]] && return ${r}
-
-	if [[ -z ${netmask} ]]; then
-		for (( i=1; i<${#config[@]}-1; i++ )); do
-			if [[ ${config[i]} == "netmask" ]]; then
-				netmask="${config[i+1]}"
-				cidr="$(netmask2cidr "${netmask}")"
-				break
-			fi
-		done
-		[[ -z ${netmask} ]] && return ${r}
-	fi
-
-	local network="$(ip_network "${ip}" "${netmask}")"
-
-	if route del -net "${network}/${cidr}" metric 0 dev "${iface}" \
-		2>/dev/null ; then
-		route add -net "${network}/${cidr}" metric "${!metric:-0}" dev "${iface}"
-	fi
-
-	return ${r}
-}
-
-# void ifconfig_route_metric(char* interface, int metric)
-#
-# Change all routes for an interface to a given metric
-ifconfig_route_metric() {
-	local dest gateway mask flags metric ref use
-	route -n | grep " $1$" | {
-		while read dest gateway mask flags metric ref use ; do
-			if [[ ${gateway} != "0.0.0.0" ]]; then
-				gateway="gw ${gateway}"
-			else
-				unset gateway
-			fi
-			route del ${dest}
-			route add -net ${dest} netmask ${mask} ${gateway} metric "$2" dev "$1"
-		done
-	}
-}
-
-# void ifconfig_default_route(char* interface, char* gateway_ip, int metric)
-#
-# Force default route to the specified gateway
-ifconfig_default_route() {
-	local metric="${3:-0}"
-
-	# Delete any existing default routes
-	while true ; do
-		route del default metric "${metric}" dev "$1" 2>/dev/null || break
-	done
-
-	# Then we add our route
-	route add default gw "$2" metric "${metric}" dev "$1"
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/ifconfig.sh b/net-scripts/net.modules.d/ifconfig.sh
new file mode 100644
index 0000000..bec988e
--- /dev/null
+++ b/net-scripts/net.modules.d/ifconfig.sh
@@ -0,0 +1,453 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# Fix any potential localisation problems
+# Note that LC_ALL trumps LC_anything_else according to locale(7)
+ifconfig() {
+	LC_ALL=C /sbin/ifconfig "$@"
+}
+
+ifconfig_tunnel() {
+	LC_ALL=C /sbin/iptunnel "$@"
+}
+
+route() {
+	LC_ALL=C /sbin/route "$@"
+}
+
+# void ifconfig_depend(void)
+#
+# Sets up the dependancies for the module
+ifconfig_depend() {
+	provide interface
+}
+
+# void ifconfig_expose(void)
+#
+# Expose variables that can be configured
+ifconfig_expose() {
+	variables config routes fallback metric ifconfig \
+		ifconfig_fallback routes inet6 iface alias broadcast netmask
+}
+
+# bool ifconfig_check_installed(void)
+#
+# Returns 1 if ifconfig is installed, otherwise 0
+ifconfig_check_installed() {
+	[[ -x /sbin/ifconfig ]] && return 0
+	${1:-false} && eerror "For ifconfig support, emerge sys-apps/net-tools"
+	return 1
+}
+
+# bool ifconfig_exists(char *interface, bool report)
+#
+# Returns 1 if the interface exists, otherwise 0
+ifconfig_exists() {
+	local e="$(ifconfig -a | grep -o "^$1")" report="${2:-false}"
+	[[ -n ${e} ]] && return 0
+
+	if ${report} ; then
+		eerror "network interface $1 does not exist"
+		eerror "Please verify hardware or kernel module (driver)"
+	fi
+
+	return 1
+}
+
+# void ifconfig_up(char *iface)
+#
+# provides a generic interface for bringing interfaces up
+ifconfig_up() {
+	ifconfig "$1" up
+}
+
+# void ifconfig_down(char *iface)
+#
+# provides a generic interface for bringing interfaces down
+ifconfig_down() {
+	ifconfig "$1" down
+}
+
+# bool ifconfig_is_up(char *iface, bool withaddress)
+#
+# Returns 0 if the interface is up, otherwise 1
+# If withaddress is true then the interface has to have an IPv4 address
+# assigned as well
+ifconfig_is_up() {
+	local check="\<UP\>" addr="${2:-false}"
+	${addr} && check="\<inet addr:.*${check}"
+	ifconfig "$1" | grep -Eq "${check}" && return 0
+	return 1
+}
+
+# void ifconfig_set_flag(char *iface, char *flag, bool enabled)
+#
+# Sets or disables the interface flag 
+ifconfig_set_flag() {
+	local iface="$1" flag="$2" enable="$3"
+	${enable} || flag="-${flag}"
+	ifconfig "${iface}" "${flag}"
+}
+
+# void ifconfig_get_address(char *interface)
+#
+# Fetch the address retrieved by DHCP.  If successful, echoes the
+# address on stdout, otherwise echoes nothing.
+ifconfig_get_address() {
+	local -a x=( $( ifconfig "$1" \
+	| sed -n -e 's/.*inet addr:\([^ ]*\).*Mask:\([^ ]*\).*/\1 \2/p' ) )
+	x[1]="$(netmask2cidr "${x[1]}")"
+	[[ -n ${x[0]} ]] && echo "${x[0]}/${x[1]}"
+}
+
+# bool ifconfig_is_ethernet(char *interface)
+#
+# Return 0 if the link is ethernet, otherwise 1.
+ifconfig_is_ethernet() {
+	ifconfig "$1" | grep -q "^$1[[:space:]]*Link encap:Ethernet[[:space:]]"
+}
+
+# void ifconfig_get_mac_address(char *interface)
+#
+# Fetch the mac address assingned to the network card
+ifconfig_get_mac_address() {
+	local mac="$(ifconfig "$1" | sed -n -e \
+		's/.*HWaddr[ \t]*\<\(..:..:..:..:..:..\)\>.*/\U\1/p')"
+	[[ ${mac} != '00:00:00:00:00:00' \
+	&& ${mac} != '44:44:44:44:44:44' \
+	&& ${mac} != 'FF:FF:FF:FF:FF:FF' ]] \
+		&& echo "${mac}"
+}
+
+# void ifconfig_set_mac_address(char *interface, char *mac)
+#
+# Assigned the mac address to the network card
+ifconfig_set_mac_address() {
+	ifconfig "$1" hw ether "$2"
+}
+
+# int ifconfig_set_name(char *interface, char *new_name)
+#
+# Renames the interface
+# This will not work if the interface is setup!
+ifconfig_set_name() {
+	[[ -z $2 ]] && return 1
+	local current="$1" new="$2"
+
+	local mac="$(ifconfig_get_mac_address "${current}")"
+	if [[ -z ${mac} ]]; then
+		eerror "${iface} does not have a MAC address"
+		return 1
+	fi
+
+	/sbin/nameif "${new}" "${mac}"
+}
+
+# void ifconfig_get_aliases_rev(char *interface)
+#
+# Fetch the list of aliases for an interface.  
+# Outputs a space-separated list on stdout, in reverse order, for
+# example "eth0:2 eth0:1"
+ifconfig_get_aliases_rev() {
+	ifconfig | grep -o "^$1:[0-9]* " | tac
+}
+
+# bool ifconfig_del_addresses(char *interface, bool onlyinet)
+#
+# Remove addresses from interface.  Returns 0 (true) if there
+# were addresses to remove (whether successful or not).  Returns 1
+# (false) if there were no addresses to remove.
+# If onlyinet is true then we only delete IPv4 / inet addresses
+ifconfig_del_addresses() {
+	local iface="$1" i onlyinet="${2:-false}"
+	# We don't remove addresses from aliases
+	[[ ${iface} == *:* ]] && return 0
+
+	# If the interface doesn't exist, don't try and delete
+	ifconfig_exists "${iface}" || return 0
+
+	# iproute2 can add many addresses to an iface unlike ifconfig ...
+	# iproute2 added addresses cause problems for ifconfig
+	# as we delete an address, a new one appears, so we have to
+	# keep polling
+	while ifconfig "${iface}" | grep -q -m1 -o 'inet addr:[^ ]*' ; do
+		ifconfig "${iface}" 0.0.0.0 || break
+	done
+
+	# Remove IPv6 addresses
+	if ! ${onlyinet} ; then
+		for i in $( ifconfig "${iface}" \
+			| sed -n -e 's/^.*inet6 addr: \([^ ]*\) Scope:[^L].*/\1/p' ) ; do
+			/sbin/ifconfig "${iface}" inet6 del "${i}"
+		done
+	fi
+	return 0
+}
+
+# bool ifconfig_get_old_config(char *iface)
+#
+# Returns config and config_fallback for the given interface
+ifconfig_get_old_config() {
+	local iface="$1" ifvar="$(bash_variable "$1")" i inet6
+
+	config="ifconfig_${ifvar}[@]"
+	config=( "${!config}" )
+	config_fallback="ifconfig_fallback_${ifvar}[@]"
+	config_fallback=( "${!config_fallback}" )
+	inet6="inet6_${ifvar}[@]"
+	inet6=( "${!inet6}" )
+
+	# BACKWARD COMPATIBILITY: populate the config_IFACE array
+	# if iface_IFACE is set (fex. iface_eth0 instead of ifconfig_eth0)
+	i="iface_${ifvar}"
+	if [[ -n ${!i} && -z ${config} ]]; then
+		# Make sure these get evaluated as arrays
+		local -a aliases broadcasts netmasks
+
+		# Start with the primary interface
+		config=( ${!i} )
+
+		# ..then add aliases
+		aliases="alias_${ifvars}"
+		aliases=( ${!aliases} )
+		broadcasts="broadcast_${ifvar}"
+		broadcasts=( ${!broadcasts} )
+		netmasks="netmask_${ifvar}"
+		netmasks=( ${!netmasks} )
+		for (( i=0; i<${#aliases[@]}; i++ )); do
+			config[i+1]="${aliases[i]} ${broadcasts[i]:+broadcast ${broadcasts[i]}} ${netmasks[i]:+netmask ${netmasks[i]}}"
+		done
+	fi
+
+	# BACKWARD COMPATIBILITY: check for space-separated inet6 addresses
+	[[ ${#inet6[@]} == 1 && ${inet6} == *' '* ]] &&  inet6=( ${inet6} )
+
+	# Add inet6 addresses to our config if required
+	[[ -n ${inet6} ]] && config=( "${config[@]}" "${inet6[@]}" )
+
+	return 0
+}
+
+# bool ifconfig_iface_stop(char *interface)
+#
+# Do final shutdown for an interface or alias.
+#
+# Returns 0 (true) when successful, non-zero (false) on failure
+ifconfig_iface_stop() {
+	# If an alias is already down, then "ifconfig eth0:1 down"
+	# will try to bring it up with an address of "down" which
+	# fails.  Do some double-checking before returning error
+	# status
+	ifconfig_is_up "$1" || return 0
+	ifconfig_down "$1" && return 0
+
+	# It is sometimes impossible to transition an alias from the
+	# UP state... particularly if the alias has no address.  So
+	# ignore the failure, which should be okay since the entire
+	# interface will be shut down eventually.
+	[[ $1 == *:* ]] && return 0
+	return 1
+}
+
+# bool ifconfig_pre_start(char *interface)
+#
+# Runs any pre_start stuff on our interface - just the MTU atm
+# We set MTU twice as it may be needed for DHCP - a dhcp client could
+# change it in error, so we set MTU in post start too
+ifconfig_pre_start() {
+	local iface="$1"
+
+	interface_exists "${iface}" || return 0
+
+	local ifvar="$(bash_variable "$1")" mtu
+
+	# MTU support
+	mtu="mtu_${ifvar}"
+	[[ -n ${!mtu} ]] && ifconfig "${iface}" mtu "${!mtu}"
+
+	return 0
+}
+
+
+# bool ifconfig_post_start(char *iface)
+#
+# Bring up iface using ifconfig utilities, called from iface_start
+#
+# Returns 0 (true) when successful on the primary interface, non-zero
+# (false) when the primary interface fails.  Aliases are allowed to
+# fail, the routine should still return success to indicate that
+# net.eth0 was successful
+ifconfig_post_start() {
+	local iface="$1" ifvar="$(bash_variable "$1")" routes x metric mtu cidr
+	metric="metric_${ifvar}"
+
+	ifconfig_exists "${iface}" || return 0
+	
+	# Make sure interface is marked UP
+	ifconfig_up "${iface}"
+
+	# MTU support
+	mtu="mtu_${ifvar}"
+	[[ -n ${!mtu} ]] && ifconfig "${iface}" mtu "${!mtu}"
+
+	routes="routes_${ifvar}[@]"
+	routes=( "${!routes}" )
+
+	# BACKWARD COMPATIBILITY: set the default gateway
+	if [[ ${gateway} == "${iface}/"* ]]; then
+		# We don't add the old gateway if one has been set in routes_IFACE
+		local gw=true
+		for x in "${routes[@]}"; do
+			[[ ${x} != *"default gw"* ]] && continue
+			gw=false
+			break
+		done
+		${gw} && routes=( "${routes[@]}" "default gw ${gateway#*/}" )
+	fi
+
+	[[ -z ${routes} ]] && return 0
+
+	# Add routes for this interface, might even include default gw
+	einfo "Adding routes"
+	eindent
+	for x in "${routes[@]}"; do
+		ebegin "${x}"
+
+		# Support iproute2 style routes
+		x="${x//via/gw} "
+		x="${x//scope * / }"
+
+		# Assume we're a net device unless told otherwise
+		[[ " ${x} " != *" -net "* && " ${x} " != *" -host "* ]] && x="-net ${x}"
+
+		# Support adding IPv6 addresses easily
+		if [[ ${x} == *:* ]]; then
+			[[ ${x} != *"-A inet6"* ]] && x="-A inet6 ${x}"
+			x="${x// -net / }"
+		fi
+
+		# Add a metric if we don't have one
+		[[ ${x} != *" metric "* ]] && x="${x} metric ${!metric}"
+
+		route add ${x} dev "${iface}"
+		eend $?
+	done
+	eoutdent
+
+	return 0
+}
+
+# bool ifconfig_add_address(char *iface, char *options ...)
+#
+# Adds the given address to the interface
+ifconfig_add_address() {
+	local iface="$1" i=0 r e real_iface="$(interface_device "$1")"
+
+	ifconfig_exists "${real_iface}" true || return 1
+	
+	# Extract the config
+	local -a config=( "$@" )
+	config=( ${config[@]:1} )
+
+	if [[ ${config[0]} == *:* ]]; then
+		# Support IPv6 - nice and simple
+		config[0]="inet6 add ${config[0]}"
+	else
+		# IPv4 is tricky - ifconfig requires an aliased device
+		# for multiple addresses
+		if ifconfig "${iface}" | grep -Eq "\<inet addr:.*" ; then
+			# Get the last alias made for the interface and add 1 to it
+			i="$(ifconfig | tac | grep -m 1 -o "^${iface}:[0-9]*" \
+				| sed -n -e 's/'"${iface}"'://p')"
+			i="${i:-0}"
+			(( i++ ))
+			iface="${iface}:${i}"
+		fi
+
+		# ifconfig doesn't like CIDR addresses
+		local ip="${config[0]%%/*}" cidr="${config[0]##*/}" netmask
+		if [[ -n ${cidr} && ${cidr} != "${ip}" ]]; then
+			netmask="$(cidr2netmask "${cidr}")"
+			config[0]="${ip} netmask ${netmask}"
+		fi	
+
+		# Support iproute2 style config where possible
+		r="${config[@]}"
+		config=( ${r//brd +/} )
+		config=( "${config[@]//brd/broadcast}" )
+		config=( "${config[@]//peer/pointopoint}" )
+	fi
+
+	# Ensure that the interface is up so we can add IPv6 addresses
+	interface_up "${real_iface}"
+
+	# Some kernels like to apply lo with an address when they are brought up
+	if [[ ${iface} == "lo" && ${config[@]} == "127.0.0.1 netmask 255.0.0.0 broadcast 127.255.255.255" ]]; then
+		ifconfig "${iface}" 0.0.0.0
+	fi
+
+	ifconfig "${iface}" ${config[@]}
+	r="$?"
+	[[ ${r} != "0" ]] && return ${r}
+
+	local metric ifvar="$(bash_variable "${real_iface}")"
+	# Remove the newly added route and replace with our metric
+	metric="metric_${ifvar}"
+	[[ ${!metric:-0} == "0" ]] && return ${r}
+
+	if [[ -z ${netmask} ]]; then
+		for (( i=1; i<${#config[@]}-1; i++ )); do
+			if [[ ${config[i]} == "netmask" ]]; then
+				netmask="${config[i+1]}"
+				cidr="$(netmask2cidr "${netmask}")"
+				break
+			fi
+		done
+		[[ -z ${netmask} ]] && return ${r}
+	fi
+
+	local network="$(ip_network "${ip}" "${netmask}")"
+
+	if route del -net "${network}/${cidr}" metric 0 dev "${iface}" \
+		2>/dev/null ; then
+		route add -net "${network}/${cidr}" metric "${!metric:-0}" dev "${iface}"
+	fi
+
+	return ${r}
+}
+
+# void ifconfig_route_metric(char* interface, int metric)
+#
+# Change all routes for an interface to a given metric
+ifconfig_route_metric() {
+	local dest gateway mask flags metric ref use
+	route -n | grep " $1$" | {
+		while read dest gateway mask flags metric ref use ; do
+			if [[ ${gateway} != "0.0.0.0" ]]; then
+				gateway="gw ${gateway}"
+			else
+				unset gateway
+			fi
+			route del ${dest}
+			route add -net ${dest} netmask ${mask} ${gateway} metric "$2" dev "$1"
+		done
+	}
+}
+
+# void ifconfig_default_route(char* interface, char* gateway_ip, int metric)
+#
+# Force default route to the specified gateway
+ifconfig_default_route() {
+	local metric="${3:-0}"
+
+	# Delete any existing default routes
+	while true ; do
+		route del default metric "${metric}" dev "$1" 2>/dev/null || break
+	done
+
+	# Then we add our route
+	route add default gw "$2" metric "${metric}" dev "$1"
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/ifplugd b/net-scripts/net.modules.d/ifplugd
deleted file mode 100644
index 8fa1cc1..0000000
--- a/net-scripts/net.modules.d/ifplugd
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void ifplugd_depend(void)
-#
-# Sets up the dependancies for the module
-ifplugd_depend() {
-	after macnet rename
-	before interface
-	functions interface_exists interface_get_mac_address
-	provide plug
-}
-
-# void ifplugd_expose(void)
-#
-# Expose variables that can be configured
-ifplugd_expose() {
-	variables plug_timeout
-}
-
-# bool ifplugd_check_installed(void)
-#
-# Returns 0 if ifplugd is installed, otherwise 1
-ifplugd_check_installed() {
-	if [[ ! -x /usr/sbin/ifplugd ]]; then
-		${1:-false} && eerror "For ifplugd support, emerge sys-apps/ifplugd"
-		return 1
-	fi
-	return 0
-}
-
-# bool ifplugd_pre_start(char *interface)
-#
-# Start ifplugd on an interface
-ifplugd_pre_start() {
-	local iface="$1" ifvar="$(bash_variable "$1")" timeout opts
-	local pidfile="/var/run/ifplugd.${iface}.pid"
-
-	# We don't start ifplugd if we're being called from the background
-	${IN_BACKGROUND} && return 0
-
-	interface_exists "${iface}" || return 0
-
-	# ifplugd could have been started by the old init script
-	if [[ -e ${pidfile} ]] ; then
-		vewarn "ifplugd is already running on ${iface}"
-		return 0
-	fi
-
-	# We need a valid MAC address
-	# It's a basic test to ensure it's not a virtual interface
-	local mac="$(interface_get_mac_address "${iface}")"
-	if [[ -z ${mac} ]] ; then
-		vewarn "ifplugd only works on interfaces with a valid MAC address"
-		return 0
-	fi
-
-	# We don't work on bonded, bridges, tun/tap, vlan or wireless
-	for f in bonding bridge tuntap vlan ; do
-		if is_function "${f}_exists" ; then
-			if ${f}_exists "${iface}" ; then
-				veinfo "ifplugd does not work with ${f}"
-				return 0
-			fi
-		fi
-	done
-	
-	# Do some options
-	opts="ifplugd_${ifvar}"
-	
-	# We don't work on wirelesss interfaces
-	# Although ifplugd can, we prefer wpa_supplicant, unless explicitly told
-	# so via our options
-	if [[ " ${!opts} " != *" -m wlan "* \
-		&& " ${!opts} " != *" --api-mode=wlan "* ]] ; then
-		if is_function wireless_exists ; then
-			if wireless_exists "${iface}" ; then
-				veinfo "ifplugd does not work on wireless interfaces"
-				return 0
-			fi
-		fi
-	fi
-
-	ebegin "Starting ifplugd on ${iface}"
-
-	# We need the interface up for ifplugd to listen to netlink events
-	interface_up "${iface}"
-
-	# Mark the us as inactive so ifplugd can restart us
-	mark_service_inactive "net.${iface}"
-
-	# Start ifplugd
-	eval start-stop-daemon --start --exec /usr/sbin/ifplugd \
-		--pidfile "${pidfile}" \
-		-- "${!opts}" --iface="${iface}"
-	eend "$?" || return 1
-
-	eindent
-
-	timeout="timeout_${ifvar}"
-	timeout="${!timeout:--1}"
-	if [[ ${timeout} == "0" ]] ; then
-		ewarn "WARNING: infinite timeout set for ${iface} to come up"
-	elif [[ ${timeout} -lt 0 ]] ; then
-		einfo "Backgrounding ..."
-		exit 0
-	fi
-
-	veinfo "Waiting for ${iface} to be marked as started"
-
-	local i=0
-	while true ; do
-		if service_started "net.${iface}" ; then
-			local addr="$(interface_get_address "${iface}")"
-			einfo "${iface} configured with address ${addr}"
-			exit 0
-		fi
-		sleep 1
-		[[ ${timeout} == "0" ]] && continue
-		(( i++ ))
-		[[ ${i} == "${timeout}" || ${i} -gt "${timeout}" ]] && break
-	done
-
-	eend 1 "Failed to configure ${iface} in the background"
-	exit 0
-}
-
-# bool ifplugd_stop(char *iface)
-#
-# Stops ifplugd on an interface
-# Returns 0 (true) when successful, non-zero otherwise
-ifplugd_stop() {
-	${IN_BACKGROUND} && return 0
-	local iface="$1"
-	local pidfile="/var/run/ifplugd.${iface}.pid"
-
-	[[ ! -e ${pidfile} ]] && return 0
-	
-	ebegin "Stopping ifplugd on ${iface}"
-	start-stop-daemon --stop --exec /usr/sbin/ifplugd \
-		--pidfile "${pidfile}" --signal 3
-	eend $?
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/ifplugd.sh b/net-scripts/net.modules.d/ifplugd.sh
new file mode 100644
index 0000000..8fa1cc1
--- /dev/null
+++ b/net-scripts/net.modules.d/ifplugd.sh
@@ -0,0 +1,146 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void ifplugd_depend(void)
+#
+# Sets up the dependancies for the module
+ifplugd_depend() {
+	after macnet rename
+	before interface
+	functions interface_exists interface_get_mac_address
+	provide plug
+}
+
+# void ifplugd_expose(void)
+#
+# Expose variables that can be configured
+ifplugd_expose() {
+	variables plug_timeout
+}
+
+# bool ifplugd_check_installed(void)
+#
+# Returns 0 if ifplugd is installed, otherwise 1
+ifplugd_check_installed() {
+	if [[ ! -x /usr/sbin/ifplugd ]]; then
+		${1:-false} && eerror "For ifplugd support, emerge sys-apps/ifplugd"
+		return 1
+	fi
+	return 0
+}
+
+# bool ifplugd_pre_start(char *interface)
+#
+# Start ifplugd on an interface
+ifplugd_pre_start() {
+	local iface="$1" ifvar="$(bash_variable "$1")" timeout opts
+	local pidfile="/var/run/ifplugd.${iface}.pid"
+
+	# We don't start ifplugd if we're being called from the background
+	${IN_BACKGROUND} && return 0
+
+	interface_exists "${iface}" || return 0
+
+	# ifplugd could have been started by the old init script
+	if [[ -e ${pidfile} ]] ; then
+		vewarn "ifplugd is already running on ${iface}"
+		return 0
+	fi
+
+	# We need a valid MAC address
+	# It's a basic test to ensure it's not a virtual interface
+	local mac="$(interface_get_mac_address "${iface}")"
+	if [[ -z ${mac} ]] ; then
+		vewarn "ifplugd only works on interfaces with a valid MAC address"
+		return 0
+	fi
+
+	# We don't work on bonded, bridges, tun/tap, vlan or wireless
+	for f in bonding bridge tuntap vlan ; do
+		if is_function "${f}_exists" ; then
+			if ${f}_exists "${iface}" ; then
+				veinfo "ifplugd does not work with ${f}"
+				return 0
+			fi
+		fi
+	done
+	
+	# Do some options
+	opts="ifplugd_${ifvar}"
+	
+	# We don't work on wirelesss interfaces
+	# Although ifplugd can, we prefer wpa_supplicant, unless explicitly told
+	# so via our options
+	if [[ " ${!opts} " != *" -m wlan "* \
+		&& " ${!opts} " != *" --api-mode=wlan "* ]] ; then
+		if is_function wireless_exists ; then
+			if wireless_exists "${iface}" ; then
+				veinfo "ifplugd does not work on wireless interfaces"
+				return 0
+			fi
+		fi
+	fi
+
+	ebegin "Starting ifplugd on ${iface}"
+
+	# We need the interface up for ifplugd to listen to netlink events
+	interface_up "${iface}"
+
+	# Mark the us as inactive so ifplugd can restart us
+	mark_service_inactive "net.${iface}"
+
+	# Start ifplugd
+	eval start-stop-daemon --start --exec /usr/sbin/ifplugd \
+		--pidfile "${pidfile}" \
+		-- "${!opts}" --iface="${iface}"
+	eend "$?" || return 1
+
+	eindent
+
+	timeout="timeout_${ifvar}"
+	timeout="${!timeout:--1}"
+	if [[ ${timeout} == "0" ]] ; then
+		ewarn "WARNING: infinite timeout set for ${iface} to come up"
+	elif [[ ${timeout} -lt 0 ]] ; then
+		einfo "Backgrounding ..."
+		exit 0
+	fi
+
+	veinfo "Waiting for ${iface} to be marked as started"
+
+	local i=0
+	while true ; do
+		if service_started "net.${iface}" ; then
+			local addr="$(interface_get_address "${iface}")"
+			einfo "${iface} configured with address ${addr}"
+			exit 0
+		fi
+		sleep 1
+		[[ ${timeout} == "0" ]] && continue
+		(( i++ ))
+		[[ ${i} == "${timeout}" || ${i} -gt "${timeout}" ]] && break
+	done
+
+	eend 1 "Failed to configure ${iface} in the background"
+	exit 0
+}
+
+# bool ifplugd_stop(char *iface)
+#
+# Stops ifplugd on an interface
+# Returns 0 (true) when successful, non-zero otherwise
+ifplugd_stop() {
+	${IN_BACKGROUND} && return 0
+	local iface="$1"
+	local pidfile="/var/run/ifplugd.${iface}.pid"
+
+	[[ ! -e ${pidfile} ]] && return 0
+	
+	ebegin "Stopping ifplugd on ${iface}"
+	start-stop-daemon --stop --exec /usr/sbin/ifplugd \
+		--pidfile "${pidfile}" --signal 3
+	eend $?
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/ip6to4 b/net-scripts/net.modules.d/ip6to4
deleted file mode 100644
index 4dde13f..0000000
--- a/net-scripts/net.modules.d/ip6to4
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void ip6to4_depend(void)
-#
-# Sets up the dependancies for the module
-ip6to4_depend() {
-	after interface
-	functions interface_exists interface_get_address interface_tunnel
-}
-
-# void ip6to4_expose(void)
-#
-# Expose variables that can be configured
-ip6to4_expose() {
-	variables link
-}
-
-# bool ip6to4_start(char *interface)
-#
-# Configures IPv6 addresses to be added to the tunnel based on a IPv4
-# addresses on a pre-configured interface.
-# Returns 0 on success, otherwise 1.
-ip6to4_start() {
-	local iface="$1" addr=""
-	local ifvar="$(bash_variable "${iface}")"
-
-	# Ensure the interface is sit0 if we're using ifconfig
-	if [[ " ${MODULES[@]} " == *" ifconfig "* && ${iface} != "sit0" ]] ; then
-		eerror "ip6to4 can only on interface sit0 using ifconfig"
-		eerror "emerge sys-apps/iproute2 to use other interfaces"
-		return 1
-	fi
-
-	local host="link_${ifvar}"
-	if [[ -z ${!host} ]] ; then
-		eerror "link_${ifvar} is not set"
-		return 1
-	fi
-	
-	interface_exists "${!host}" true || return 1
-	
-	# An interface can have more than 1 ip address
-	local -a addrs=( $(interface_get_address "${!host}") )
-	if [[ -z ${addrs} ]] ; then
-		eerror "${!host} is not configured with an IPv4 address"
-		return 1
-	fi
-
-	local -a new=()
-	local addr=""
-	for addr in "${addrs[@]}" ; do
-		# Strip the subnet
-		local ip="${addr%/*}" subnet="${addr#*/}"
-		# We don't work on private IPv4 addresses
-		[[ ${ip} == "127."* ]] && continue
-		[[ ${ip} == "10."* ]] && continue
-		[[ ${ip} == "192.168."* ]] && continue
-		local i
-		for ((i=16; i<32; i++)); do
-			[[ ${ip} == "172.${i}."* ]] && break 
-		done
-		[[ ${i} -lt 32 ]] && continue
-	
-		veinfo "IPv4 address on ${!host}: ${ip}"
-		local ip6="$(printf "2002:%02x%02x:%02x%02x::1" ${ip//./ })"
-		veinfo "Derived IPv6 address: ${ip6}"
-
-		# Now apply our IPv6 address to our config
-		new=( "${new[@]}" "${ip6}/16" )
-	done	
-
-	if [[ -z ${new} ]] ; then
-		eerror "No global IPv4 addresses found on interface ${!host}"
-		return 1
-	fi
-
-	if [[ ${iface} != "sit0" ]] ; then
-		ebegin "Creating 6to4 tunnel on ${iface}"
-		interface_tunnel add "${iface}" mode sit ttl 255 remote any local "${ip}"
-		eend $? || return 1
-	fi
-	
-	# Now apply our config
-	config=( "${config[@]}" "${new[@]}" )
-
-	# Add a route for us, ensuring we don't delete anything else
-	local routes="routes_${ifvar}[@]"
-	eval "routes_${ifvar}=( \"\${!routes}\" \
-			\"2003::/3 via ::192.88.99.1 metric 2147483647\" )"
-}
-	
-# vim:ts=4
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/ip6to4.sh b/net-scripts/net.modules.d/ip6to4.sh
new file mode 100644
index 0000000..4dde13f
--- /dev/null
+++ b/net-scripts/net.modules.d/ip6to4.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void ip6to4_depend(void)
+#
+# Sets up the dependancies for the module
+ip6to4_depend() {
+	after interface
+	functions interface_exists interface_get_address interface_tunnel
+}
+
+# void ip6to4_expose(void)
+#
+# Expose variables that can be configured
+ip6to4_expose() {
+	variables link
+}
+
+# bool ip6to4_start(char *interface)
+#
+# Configures IPv6 addresses to be added to the tunnel based on a IPv4
+# addresses on a pre-configured interface.
+# Returns 0 on success, otherwise 1.
+ip6to4_start() {
+	local iface="$1" addr=""
+	local ifvar="$(bash_variable "${iface}")"
+
+	# Ensure the interface is sit0 if we're using ifconfig
+	if [[ " ${MODULES[@]} " == *" ifconfig "* && ${iface} != "sit0" ]] ; then
+		eerror "ip6to4 can only on interface sit0 using ifconfig"
+		eerror "emerge sys-apps/iproute2 to use other interfaces"
+		return 1
+	fi
+
+	local host="link_${ifvar}"
+	if [[ -z ${!host} ]] ; then
+		eerror "link_${ifvar} is not set"
+		return 1
+	fi
+	
+	interface_exists "${!host}" true || return 1
+	
+	# An interface can have more than 1 ip address
+	local -a addrs=( $(interface_get_address "${!host}") )
+	if [[ -z ${addrs} ]] ; then
+		eerror "${!host} is not configured with an IPv4 address"
+		return 1
+	fi
+
+	local -a new=()
+	local addr=""
+	for addr in "${addrs[@]}" ; do
+		# Strip the subnet
+		local ip="${addr%/*}" subnet="${addr#*/}"
+		# We don't work on private IPv4 addresses
+		[[ ${ip} == "127."* ]] && continue
+		[[ ${ip} == "10."* ]] && continue
+		[[ ${ip} == "192.168."* ]] && continue
+		local i
+		for ((i=16; i<32; i++)); do
+			[[ ${ip} == "172.${i}."* ]] && break 
+		done
+		[[ ${i} -lt 32 ]] && continue
+	
+		veinfo "IPv4 address on ${!host}: ${ip}"
+		local ip6="$(printf "2002:%02x%02x:%02x%02x::1" ${ip//./ })"
+		veinfo "Derived IPv6 address: ${ip6}"
+
+		# Now apply our IPv6 address to our config
+		new=( "${new[@]}" "${ip6}/16" )
+	done	
+
+	if [[ -z ${new} ]] ; then
+		eerror "No global IPv4 addresses found on interface ${!host}"
+		return 1
+	fi
+
+	if [[ ${iface} != "sit0" ]] ; then
+		ebegin "Creating 6to4 tunnel on ${iface}"
+		interface_tunnel add "${iface}" mode sit ttl 255 remote any local "${ip}"
+		eend $? || return 1
+	fi
+	
+	# Now apply our config
+	config=( "${config[@]}" "${new[@]}" )
+
+	# Add a route for us, ensuring we don't delete anything else
+	local routes="routes_${ifvar}[@]"
+	eval "routes_${ifvar}=( \"\${!routes}\" \
+			\"2003::/3 via ::192.88.99.1 metric 2147483647\" )"
+}
+	
+# vim:ts=4
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/ipppd b/net-scripts/net.modules.d/ipppd
deleted file mode 100644
index 0280ea6..0000000
--- a/net-scripts/net.modules.d/ipppd
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void ipppd_depend(void)
-#
-# Sets up the dependancies for the module
-ipppd_depend() {
-	after macnet
-	before interface
-	provide isdn
-	functions interface_exists interface_type
-	variables ipppd
-}
-
-# bool ipppd_check_installed(void)
-#
-# Returns 1 if isnd4k-utils is installed, otherwise 0
-ipppd_check_installed() {
-	[[ -x /usr/sbin/ipppd ]] && return 0
-	${1:-false} && eerror "For ISDN (ipppd) support, emerge net-dialup/isdn4k-utils"
-	return 1
-}
-
-# bool ipppd_start(char *iface)
-#
-# Start isdn on an interface
-#
-# Returns 0 (true) when successful, non-zero otherwise
-ipppd_pre_start() {
-	local iface="$1" opts itype="$(interface_type "$1")"
-	local pidfile="/var/run/ipppd-${iface}.pid"
-
-	# Check that we are a valid isdn interface
-	[[ ${itype} != "ippp" && ${itype} != "isdn" ]] && return 0
-
-	# Check that the interface exists
-	interface_exists "${iface}" true || return 1
-
-	local ifvar="$(bash_variable "${iface}")"
-	# Might or might not be set in conf.d/net
-	opts="ipppd_${ifvar}"
-
-	einfo "Starting ipppd for ${iface}"
-	start-stop-daemon --start --exec /usr/sbin/ipppd \
-		--pidfile "${pidfile}" \
-		-- ${!opts} pidfile "${pidfile}" \
-		file "/etc/ppp/options.${iface}" >/dev/null
-	eend $? || return $?
-
-	return 0
-}
-
-# bool ipppd_stop(char *iface)
-#
-# Stop isdn on an interface
-# Returns 0 (true) when successful, non-zero otherwise
-ipppd_stop() {
-	local iface="$1" pidfile="/var/run/ipppd-$1.pid"
-
-	[[ ! -f ${pidfile} ]] && return 0
-
-	einfo "Stopping ipppd for ${iface}"
-	start-stop-daemon --stop --exec /usr/sbin/ippd \
-		--pidfile "${pidfile}"
-	eend $?
-}
-
-# vim:ts=4
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/ipppd.sh b/net-scripts/net.modules.d/ipppd.sh
new file mode 100644
index 0000000..0280ea6
--- /dev/null
+++ b/net-scripts/net.modules.d/ipppd.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void ipppd_depend(void)
+#
+# Sets up the dependancies for the module
+ipppd_depend() {
+	after macnet
+	before interface
+	provide isdn
+	functions interface_exists interface_type
+	variables ipppd
+}
+
+# bool ipppd_check_installed(void)
+#
+# Returns 1 if isnd4k-utils is installed, otherwise 0
+ipppd_check_installed() {
+	[[ -x /usr/sbin/ipppd ]] && return 0
+	${1:-false} && eerror "For ISDN (ipppd) support, emerge net-dialup/isdn4k-utils"
+	return 1
+}
+
+# bool ipppd_start(char *iface)
+#
+# Start isdn on an interface
+#
+# Returns 0 (true) when successful, non-zero otherwise
+ipppd_pre_start() {
+	local iface="$1" opts itype="$(interface_type "$1")"
+	local pidfile="/var/run/ipppd-${iface}.pid"
+
+	# Check that we are a valid isdn interface
+	[[ ${itype} != "ippp" && ${itype} != "isdn" ]] && return 0
+
+	# Check that the interface exists
+	interface_exists "${iface}" true || return 1
+
+	local ifvar="$(bash_variable "${iface}")"
+	# Might or might not be set in conf.d/net
+	opts="ipppd_${ifvar}"
+
+	einfo "Starting ipppd for ${iface}"
+	start-stop-daemon --start --exec /usr/sbin/ipppd \
+		--pidfile "${pidfile}" \
+		-- ${!opts} pidfile "${pidfile}" \
+		file "/etc/ppp/options.${iface}" >/dev/null
+	eend $? || return $?
+
+	return 0
+}
+
+# bool ipppd_stop(char *iface)
+#
+# Stop isdn on an interface
+# Returns 0 (true) when successful, non-zero otherwise
+ipppd_stop() {
+	local iface="$1" pidfile="/var/run/ipppd-$1.pid"
+
+	[[ ! -f ${pidfile} ]] && return 0
+
+	einfo "Stopping ipppd for ${iface}"
+	start-stop-daemon --stop --exec /usr/sbin/ippd \
+		--pidfile "${pidfile}"
+	eend $?
+}
+
+# vim:ts=4
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/iproute2 b/net-scripts/net.modules.d/iproute2
deleted file mode 100644
index 498eea6..0000000
--- a/net-scripts/net.modules.d/iproute2
+++ /dev/null
@@ -1,392 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Fix any potential localisation problems
-# Note that LC_ALL trumps LC_anything_else according to locale(7)
-ip() {
-	LC_ALL=C /sbin/ip "$@"
-}
-iproute2_tunnel() {
-	LC_ALL=C /sbin/ip tunnel "$@"
-}
-
-# void iproute2_depend(void)
-#
-# Sets up the dependancies for the module
-iproute2_depend() {
-	provide interface
-	functions interface_device
-}
-
-# void iproute2_expose(void)
-#
-# Expose variables that can be configured
-iproute2_expose() {
-	variables config routes fallback metric ipaddr ipaddr_fallback iproute inet6
-}
-
-# bool iproute2_check_installed(void)
-#
-# Returns 1 if iproute2 is installed, otherwise 0
-iproute2_check_installed() {
-	local report="${1:-false}" installed="0"
-	if [[ ! -x /sbin/ip ]] ; then
-		installed="1"
-		${report} && eerror "For iproute2 support, emerge sys-apps/iproute2"
-	fi
-	if [[ ! -e /proc/net/netlink ]] ; then
-		installed="1"
-		${report} && eerror "iproute2 requires NetLink enabled in the kernel"
-	fi
-	return "${installed}"
-}
-
-# bool iproute2_exists(char *interface, bool report)
-#
-# Returns 1 if the interface exists, otherwise 0
-iproute2_exists() {
-	local e="$( ip addr show label "$1" )" report="${2:-false}"
-	[[ -n ${e} ]] && return 0
-
-	if ${report} ; then
-		eerror "network interface $1 does not exist"
-		eerror "Please verify hardware or kernel module (driver)"
-	fi
-	return 1
-}
-
-# void iproute2_up(char *interface)
-#
-# provides a generic interface for bringing interfaces up
-iproute2_up() {
-	ip link set up dev "$1"
-}
-
-# void iproute2_down(char *interface)
-#
-# provides a generic interface for bringing interfaces up
-iproute2_down() {
-	ip link set down dev "$1"
-}
-
-# bool ifproute2_is_up(char *iface, bool withaddress)
-#
-# Returns 0 if the interface is up, otherwise 1
-# If withaddress is true then the interface has to have an IPv4 address
-# assigned as well
-iproute2_is_up() {
-	local check="\<UP\>" addr="${2:-false}"
-	${addr} && check="${check}.*inet "
-	ip addr show "$1" | xargs | grep -Eq "${check}" && return 0
-	return 1
-}
-
-# void iproute2_set_flag(char *iface, char *flag, bool enabled)
-#
-# Sets or disables the interface flag 
-iproute2_set_flag() {
-	local enable="$3" opt="on"
-	${enable} || opt="off"
-	ip link set "$1" "$2" "${opt}"
-}
-
-# void iproute2_get_address(char *interface)
-#
-# Fetch the address retrieved by DHCP.  If successful, echoes the
-# address on stdout, otherwise echoes nothing.
-iproute2_get_address() {
-	ip -family inet addr show "$1" | sed -n -e 's/.*inet \([^ ]*\).*/\1/p'
-}
-
-# bool iproute2_is_ethernet(char *interface)
-#
-# Return 0 if the link is ethernet, otherwise 1.
-iproute2_is_ethernet() {
-	ip link show "$1" | grep -q "^[[:space:]]*link/ether[[:space:]]*"
-}
-
-# void iproute2_get_mac_address(char *interface)
-#
-# Fetch the mac address assingned to the network card
-iproute2_get_mac_address() {
-	local mac="$( ip link show "$1" | sed -n -e \
-		'/link\// s/^.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' )"
-	[[ ${mac} != '00:00:00:00:00:00' \
-	&& ${mac} != '44:44:44:44:44:44' \
-	&& ${mac} != 'FF:FF:FF:FF:FF:FF' ]] \
-		&& echo "${mac}"
-}
-
-# void iproute2_set_mac_address(char *interface, char *mac)
-#
-# Assigned the mac address to the network card
-iproute2_set_mac_address() {
-	ip link set address "$2" dev "$1"
-}
-
-# int iproute2_set_name(char *interface, char *new_name)
-#
-# Renames the interface
-# This will not work if the interface is setup!
-iproute2_set_name() {
-	ip link set name "$2" dev "$1"
-}
-
-# void iproute2_get_aliases_rev(char *interface)
-#
-# Fetch the list of aliases for an interface.  
-# Outputs a space-separated list on stdout, in reverse order, for
-# example "eth0:2 eth0:1"
-iproute2_get_aliases_rev() {
-	local iface="$( interface_device "$1" )"
-	ip addr show dev "${iface}" | grep -o "${iface}:[0-9].*" | tac
-}
-
-# bool iproute2_del_addresses(char *interface, bool onlyinet)
-#
-# Remove addresses from interface.
-# If onlyinet is true, then we only remove IPv4 / inet addresses.
-iproute2_del_addresses() {
-	local pre=""
-	${2:-false} && pre="-f inet"
-	ip ${pre} addr flush label "$1" scope global &>/dev/null
-	ip ${pre} addr flush label "$1" scope site &>/dev/null
-	ip ${pre} addr flush label "$1" scope host &>/dev/null
-	return 0
-}
-
-# bool iproute2_get_old_config(char *iface)
-#
-# Returns config and config_fallback for the given interface
-iproute2_get_old_config() {
-	local ifvar="$( bash_variable "$1" )" inet6="" t=""
-
-	# iproute2-style config vars
-	t="ipaddr_${ifvar}[@]"
-	config=( "${!t}" )
-	t="config_fallback_${ifvar}[@]"
-	config_fallback=( "${!t}" )
-	t="inet6_${ifvar}[@]"
-	inet6=( "${!t}" )
-
-	# BACKWARD COMPATIBILITY: check for space-separated inet6 addresses
-	[[ ${#inet6[@]} == "1" && ${inet6} == *" "* ]] && inet6=( ${inet6} )
-
-	# Add inet6 addresses to our config if required
-	[[ -n ${inet6} ]] && config=( "${config[@]}" "${inet6[@]}" )
-
-	# Support old style iface_xxx syntax
-	if [[ -z ${config} ]] ; then
-		if is_function ifconfig_get_old_config ; then
-			ifconfig_get_old_config "${iface}"
-		fi
-	fi
-
-	return 0
-}
-
-# bool iproute2_iface_stop(char *interface)
-#
-# Do final shutdown for an interface or alias.
-#
-# Returns 0 (true) when successful, non-zero (false) on failure
-iproute2_iface_stop() {
-	local label="$1" iface="$( interface_device "$1" )"
-
-	# Shut down the link if this isn't an alias or vlan
-	if [[ ${label} == "${iface}" ]] ; then
-		iproute2_down "${iface}"
-		return $?
-	fi
-	return 0
-}
-
-# bool iproute2_add_address(char *interface, char *options ...)
-#
-# Adds an the specified address to the interface
-# returns 0 on success and non-zero on failure
-iproute2_add_address() {
-	local iface="$1" x=""
-
-	iproute2_exists "${iface}" true || return 1
-
-	# Extract the config
-	local -a config=( "$@" )
-	config=( ${config[@]:1} )
-
-	# Convert an ifconfig line to iproute2
-	local n="${#config[@]}"
-	for (( x=0; x<n; x++ )); do
-		case "${config[x]}" in
-			netmask)
-				config[0]="${config[0]}/$( netmask2cidr "${config[x+1]}" )"
-				unset config[x] config[x+1]
-				;;
-			mtu)
-				ip link set mtu "${config[x+1]}" dev "${iface}"
-				unset config[x] config[x+1]
-				;;
-		esac
-	done
-	config=( "${config[@]//pointopoint/peer}" )
-
-	# Always scope lo addresses as host unless specified otherwise
-	[[ ${iface} == "lo" && " ${config[@]} " != *" scope "* ]] \
-		&& config=( "${config[@]}" "scope host" )
-
-	# IPv4 specifics
-	if [[ ${config[@]} == *.*.*.* ]] ; then
-		# Work out a broadcast if none supplied
-		[[ ${config[@]} != *" brd "* && ${config[@]} != *" broadcast "* ]] \
-			&& config=( "${config[@]}" "brd +" )
-	fi
-
-	# Ensure that the interface is up so we can add IPv6 addresses
-	interface_up "${iface}"
-
-	# Some kernels like to apply lo with an address when they are brought up
-	if [[ ${iface} == "lo" \
-		&& ${config[@]} == "127.0.0.1/8 brd 127.255.255.255 scope host" ]] ; then
-		ip addr del dev "${iface}" 127.0.0.1/8 2>/dev/null
-	fi
-
-	ip addr add dev "${iface}" ${config[@]}
-	local r="$?"
-	[[ ${r} != "0" ]] && return "${r}"
-
-	local ifvar="$( bash_variable "${iface}" )"
-	# Remove the newly added route and replace with our metric
-	local metric="metric_${ifvar}"
-	[[ ${!metric:-0} == "0" ]] && return "${r}"
-
-	local network="$( ip_network "${config[0]}" )"
-	[[ -z ${network} ]] && return "${r}"
-
-	local cidr="${config[0]##*/}"
-	if ip route del "${network}/${cidr}" metric 0 dev "${iface}" \
-		2>/dev/null ; then
-		ip route add "${network}/${cidr}" metric "${!metric:-0}" dev "${iface}"
-	fi
-
-	return "${r}"
-}
-
-# bool iproute2_pre_start(char *interface)
-#
-# Runs any pre_start stuff on our interface - just the MTU atm
-# We set MTU twice as it may be needed for DHCP - a dhcp client could
-# change it in error, so we set MTU in post start too
-iproute2_pre_start() {
-	local iface="$1"
-
-	interface_exists "${iface}" || return 0
-
-	local ifvar="$( bash_variable "$1" )"
-
-	# MTU support
-	local mtu="mtu_${ifvar}"
-	[[ -n ${!mtu} ]] && ip link set mtu "${!mtu}" dev "${iface}"
-
-	return 0
-}
-
-# bool iproute2_post_start(char *interface)
-#
-# Runs any post_start stuff on our interface and adds routes
-# Always returns 0
-iproute2_post_start() {
-	local iface="$1" ifvar="$( bash_variable "$1" )" x=""
-
-	iproute2_exists "${iface}" || return 0
-	
-	# Make sure interface is marked UP
-	iproute2_up "${iface}"
-
-	# MTU support
-	local mtu="mtu_${ifvar}"
-	[[ -n ${!mtu} ]] && ip link set mtu "${!mtu}" dev "${iface}"
-
-	local x="routes_${ifvar}[@]"
-	local -a routes=( "${!x}" )
-	local metric="metric_${ifvar}"
-
-	# Test for old style ipaddr variable
-	if [[ -z ${routes} ]] ; then
-		t="iproute_${ifvar}[@]"
-		routes=( "${!t}" )
-	fi
-
-	# Set routes with ip route -- this might also include default route
-	if [[ -n ${routes} ]] ; then
-		einfo "Adding routes"
-		eindent
-		for x in "${routes[@]}"; do
-			ebegin "${x}"
-
-			# Support net-tools routing too
-			x="${x//gw/via}"
-			x="${x//-A inet6/}"
-			x="${x//-net/}"
-			[[ " ${x} " == *" -host "* ]] && x="${x//-host/} scope host"
-
-			# Attempt to support net-tools route netmask option
-			netmask="${x##* netmask }"
-			if [[ -n ${netmask} && ${x} != "${netmask}" ]] ; then
-				netmask="${netmask%% *}"
-				x="${x// netmask ${netmask} / }"
-				local -a a=( ${x} )
-				a[0]="${a[0]}/$( netmask2cidr "${netmask}")"
-				x="${a[@]}"
-			fi
-
-			# Add a metric if we don't have one
-			[[ " ${x} " != *" metric "* ]] && x="${x} metric ${!metric}"
-
-			ip route append ${x} dev "${iface}"
-			eend $?
-		done
-		eoutdent
-	fi
-
-	# Flush the route cache
-	ip route flush cache dev "${iface}"
-
-	return 0
-}
-
-# void iproute2_route_metric(char* interface, int metric)
-#
-# Change all routes for an interface to a given metric
-iproute2_route_metric() {
-	local route=""
-	ip route | grep " dev $1" | {
-		while read route ; do
-			ip route del ${route}
-			ip route add ${route} metric "$2"
-		done
-	}
-}
-
-# void iproute2_default_route(char* interface, char* gateway_ip, int metric)
-#
-# Force default route to the specified gateway, optionally on
-# the given interface
-iproute2_default_route() {
-	local metric="${3:-0}"
-
-	ip route change default via "$2" metric "${metric}" dev "$1" 2>/dev/null \
-	|| ip route append default via "$2" metric "${metric}" dev "$1" 2>/dev/null
-}
-
-# void iproute2_post_stop(char* interface)
-iproute2_post_stop() {
-	local iface="$1" rule=""
-
-	iproute2_exists "${iface}" || return
-
-	# Flush the route cache
-	ip route flush cache dev "${iface}"
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/iproute2.sh b/net-scripts/net.modules.d/iproute2.sh
new file mode 100644
index 0000000..498eea6
--- /dev/null
+++ b/net-scripts/net.modules.d/iproute2.sh
@@ -0,0 +1,392 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# Fix any potential localisation problems
+# Note that LC_ALL trumps LC_anything_else according to locale(7)
+ip() {
+	LC_ALL=C /sbin/ip "$@"
+}
+iproute2_tunnel() {
+	LC_ALL=C /sbin/ip tunnel "$@"
+}
+
+# void iproute2_depend(void)
+#
+# Sets up the dependancies for the module
+iproute2_depend() {
+	provide interface
+	functions interface_device
+}
+
+# void iproute2_expose(void)
+#
+# Expose variables that can be configured
+iproute2_expose() {
+	variables config routes fallback metric ipaddr ipaddr_fallback iproute inet6
+}
+
+# bool iproute2_check_installed(void)
+#
+# Returns 1 if iproute2 is installed, otherwise 0
+iproute2_check_installed() {
+	local report="${1:-false}" installed="0"
+	if [[ ! -x /sbin/ip ]] ; then
+		installed="1"
+		${report} && eerror "For iproute2 support, emerge sys-apps/iproute2"
+	fi
+	if [[ ! -e /proc/net/netlink ]] ; then
+		installed="1"
+		${report} && eerror "iproute2 requires NetLink enabled in the kernel"
+	fi
+	return "${installed}"
+}
+
+# bool iproute2_exists(char *interface, bool report)
+#
+# Returns 1 if the interface exists, otherwise 0
+iproute2_exists() {
+	local e="$( ip addr show label "$1" )" report="${2:-false}"
+	[[ -n ${e} ]] && return 0
+
+	if ${report} ; then
+		eerror "network interface $1 does not exist"
+		eerror "Please verify hardware or kernel module (driver)"
+	fi
+	return 1
+}
+
+# void iproute2_up(char *interface)
+#
+# provides a generic interface for bringing interfaces up
+iproute2_up() {
+	ip link set up dev "$1"
+}
+
+# void iproute2_down(char *interface)
+#
+# provides a generic interface for bringing interfaces up
+iproute2_down() {
+	ip link set down dev "$1"
+}
+
+# bool ifproute2_is_up(char *iface, bool withaddress)
+#
+# Returns 0 if the interface is up, otherwise 1
+# If withaddress is true then the interface has to have an IPv4 address
+# assigned as well
+iproute2_is_up() {
+	local check="\<UP\>" addr="${2:-false}"
+	${addr} && check="${check}.*inet "
+	ip addr show "$1" | xargs | grep -Eq "${check}" && return 0
+	return 1
+}
+
+# void iproute2_set_flag(char *iface, char *flag, bool enabled)
+#
+# Sets or disables the interface flag 
+iproute2_set_flag() {
+	local enable="$3" opt="on"
+	${enable} || opt="off"
+	ip link set "$1" "$2" "${opt}"
+}
+
+# void iproute2_get_address(char *interface)
+#
+# Fetch the address retrieved by DHCP.  If successful, echoes the
+# address on stdout, otherwise echoes nothing.
+iproute2_get_address() {
+	ip -family inet addr show "$1" | sed -n -e 's/.*inet \([^ ]*\).*/\1/p'
+}
+
+# bool iproute2_is_ethernet(char *interface)
+#
+# Return 0 if the link is ethernet, otherwise 1.
+iproute2_is_ethernet() {
+	ip link show "$1" | grep -q "^[[:space:]]*link/ether[[:space:]]*"
+}
+
+# void iproute2_get_mac_address(char *interface)
+#
+# Fetch the mac address assingned to the network card
+iproute2_get_mac_address() {
+	local mac="$( ip link show "$1" | sed -n -e \
+		'/link\// s/^.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' )"
+	[[ ${mac} != '00:00:00:00:00:00' \
+	&& ${mac} != '44:44:44:44:44:44' \
+	&& ${mac} != 'FF:FF:FF:FF:FF:FF' ]] \
+		&& echo "${mac}"
+}
+
+# void iproute2_set_mac_address(char *interface, char *mac)
+#
+# Assigned the mac address to the network card
+iproute2_set_mac_address() {
+	ip link set address "$2" dev "$1"
+}
+
+# int iproute2_set_name(char *interface, char *new_name)
+#
+# Renames the interface
+# This will not work if the interface is setup!
+iproute2_set_name() {
+	ip link set name "$2" dev "$1"
+}
+
+# void iproute2_get_aliases_rev(char *interface)
+#
+# Fetch the list of aliases for an interface.  
+# Outputs a space-separated list on stdout, in reverse order, for
+# example "eth0:2 eth0:1"
+iproute2_get_aliases_rev() {
+	local iface="$( interface_device "$1" )"
+	ip addr show dev "${iface}" | grep -o "${iface}:[0-9].*" | tac
+}
+
+# bool iproute2_del_addresses(char *interface, bool onlyinet)
+#
+# Remove addresses from interface.
+# If onlyinet is true, then we only remove IPv4 / inet addresses.
+iproute2_del_addresses() {
+	local pre=""
+	${2:-false} && pre="-f inet"
+	ip ${pre} addr flush label "$1" scope global &>/dev/null
+	ip ${pre} addr flush label "$1" scope site &>/dev/null
+	ip ${pre} addr flush label "$1" scope host &>/dev/null
+	return 0
+}
+
+# bool iproute2_get_old_config(char *iface)
+#
+# Returns config and config_fallback for the given interface
+iproute2_get_old_config() {
+	local ifvar="$( bash_variable "$1" )" inet6="" t=""
+
+	# iproute2-style config vars
+	t="ipaddr_${ifvar}[@]"
+	config=( "${!t}" )
+	t="config_fallback_${ifvar}[@]"
+	config_fallback=( "${!t}" )
+	t="inet6_${ifvar}[@]"
+	inet6=( "${!t}" )
+
+	# BACKWARD COMPATIBILITY: check for space-separated inet6 addresses
+	[[ ${#inet6[@]} == "1" && ${inet6} == *" "* ]] && inet6=( ${inet6} )
+
+	# Add inet6 addresses to our config if required
+	[[ -n ${inet6} ]] && config=( "${config[@]}" "${inet6[@]}" )
+
+	# Support old style iface_xxx syntax
+	if [[ -z ${config} ]] ; then
+		if is_function ifconfig_get_old_config ; then
+			ifconfig_get_old_config "${iface}"
+		fi
+	fi
+
+	return 0
+}
+
+# bool iproute2_iface_stop(char *interface)
+#
+# Do final shutdown for an interface or alias.
+#
+# Returns 0 (true) when successful, non-zero (false) on failure
+iproute2_iface_stop() {
+	local label="$1" iface="$( interface_device "$1" )"
+
+	# Shut down the link if this isn't an alias or vlan
+	if [[ ${label} == "${iface}" ]] ; then
+		iproute2_down "${iface}"
+		return $?
+	fi
+	return 0
+}
+
+# bool iproute2_add_address(char *interface, char *options ...)
+#
+# Adds an the specified address to the interface
+# returns 0 on success and non-zero on failure
+iproute2_add_address() {
+	local iface="$1" x=""
+
+	iproute2_exists "${iface}" true || return 1
+
+	# Extract the config
+	local -a config=( "$@" )
+	config=( ${config[@]:1} )
+
+	# Convert an ifconfig line to iproute2
+	local n="${#config[@]}"
+	for (( x=0; x<n; x++ )); do
+		case "${config[x]}" in
+			netmask)
+				config[0]="${config[0]}/$( netmask2cidr "${config[x+1]}" )"
+				unset config[x] config[x+1]
+				;;
+			mtu)
+				ip link set mtu "${config[x+1]}" dev "${iface}"
+				unset config[x] config[x+1]
+				;;
+		esac
+	done
+	config=( "${config[@]//pointopoint/peer}" )
+
+	# Always scope lo addresses as host unless specified otherwise
+	[[ ${iface} == "lo" && " ${config[@]} " != *" scope "* ]] \
+		&& config=( "${config[@]}" "scope host" )
+
+	# IPv4 specifics
+	if [[ ${config[@]} == *.*.*.* ]] ; then
+		# Work out a broadcast if none supplied
+		[[ ${config[@]} != *" brd "* && ${config[@]} != *" broadcast "* ]] \
+			&& config=( "${config[@]}" "brd +" )
+	fi
+
+	# Ensure that the interface is up so we can add IPv6 addresses
+	interface_up "${iface}"
+
+	# Some kernels like to apply lo with an address when they are brought up
+	if [[ ${iface} == "lo" \
+		&& ${config[@]} == "127.0.0.1/8 brd 127.255.255.255 scope host" ]] ; then
+		ip addr del dev "${iface}" 127.0.0.1/8 2>/dev/null
+	fi
+
+	ip addr add dev "${iface}" ${config[@]}
+	local r="$?"
+	[[ ${r} != "0" ]] && return "${r}"
+
+	local ifvar="$( bash_variable "${iface}" )"
+	# Remove the newly added route and replace with our metric
+	local metric="metric_${ifvar}"
+	[[ ${!metric:-0} == "0" ]] && return "${r}"
+
+	local network="$( ip_network "${config[0]}" )"
+	[[ -z ${network} ]] && return "${r}"
+
+	local cidr="${config[0]##*/}"
+	if ip route del "${network}/${cidr}" metric 0 dev "${iface}" \
+		2>/dev/null ; then
+		ip route add "${network}/${cidr}" metric "${!metric:-0}" dev "${iface}"
+	fi
+
+	return "${r}"
+}
+
+# bool iproute2_pre_start(char *interface)
+#
+# Runs any pre_start stuff on our interface - just the MTU atm
+# We set MTU twice as it may be needed for DHCP - a dhcp client could
+# change it in error, so we set MTU in post start too
+iproute2_pre_start() {
+	local iface="$1"
+
+	interface_exists "${iface}" || return 0
+
+	local ifvar="$( bash_variable "$1" )"
+
+	# MTU support
+	local mtu="mtu_${ifvar}"
+	[[ -n ${!mtu} ]] && ip link set mtu "${!mtu}" dev "${iface}"
+
+	return 0
+}
+
+# bool iproute2_post_start(char *interface)
+#
+# Runs any post_start stuff on our interface and adds routes
+# Always returns 0
+iproute2_post_start() {
+	local iface="$1" ifvar="$( bash_variable "$1" )" x=""
+
+	iproute2_exists "${iface}" || return 0
+	
+	# Make sure interface is marked UP
+	iproute2_up "${iface}"
+
+	# MTU support
+	local mtu="mtu_${ifvar}"
+	[[ -n ${!mtu} ]] && ip link set mtu "${!mtu}" dev "${iface}"
+
+	local x="routes_${ifvar}[@]"
+	local -a routes=( "${!x}" )
+	local metric="metric_${ifvar}"
+
+	# Test for old style ipaddr variable
+	if [[ -z ${routes} ]] ; then
+		t="iproute_${ifvar}[@]"
+		routes=( "${!t}" )
+	fi
+
+	# Set routes with ip route -- this might also include default route
+	if [[ -n ${routes} ]] ; then
+		einfo "Adding routes"
+		eindent
+		for x in "${routes[@]}"; do
+			ebegin "${x}"
+
+			# Support net-tools routing too
+			x="${x//gw/via}"
+			x="${x//-A inet6/}"
+			x="${x//-net/}"
+			[[ " ${x} " == *" -host "* ]] && x="${x//-host/} scope host"
+
+			# Attempt to support net-tools route netmask option
+			netmask="${x##* netmask }"
+			if [[ -n ${netmask} && ${x} != "${netmask}" ]] ; then
+				netmask="${netmask%% *}"
+				x="${x// netmask ${netmask} / }"
+				local -a a=( ${x} )
+				a[0]="${a[0]}/$( netmask2cidr "${netmask}")"
+				x="${a[@]}"
+			fi
+
+			# Add a metric if we don't have one
+			[[ " ${x} " != *" metric "* ]] && x="${x} metric ${!metric}"
+
+			ip route append ${x} dev "${iface}"
+			eend $?
+		done
+		eoutdent
+	fi
+
+	# Flush the route cache
+	ip route flush cache dev "${iface}"
+
+	return 0
+}
+
+# void iproute2_route_metric(char* interface, int metric)
+#
+# Change all routes for an interface to a given metric
+iproute2_route_metric() {
+	local route=""
+	ip route | grep " dev $1" | {
+		while read route ; do
+			ip route del ${route}
+			ip route add ${route} metric "$2"
+		done
+	}
+}
+
+# void iproute2_default_route(char* interface, char* gateway_ip, int metric)
+#
+# Force default route to the specified gateway, optionally on
+# the given interface
+iproute2_default_route() {
+	local metric="${3:-0}"
+
+	ip route change default via "$2" metric "${metric}" dev "$1" 2>/dev/null \
+	|| ip route append default via "$2" metric "${metric}" dev "$1" 2>/dev/null
+}
+
+# void iproute2_post_stop(char* interface)
+iproute2_post_stop() {
+	local iface="$1" rule=""
+
+	iproute2_exists "${iface}" || return
+
+	# Flush the route cache
+	ip route flush cache dev "${iface}"
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/iptunnel b/net-scripts/net.modules.d/iptunnel
deleted file mode 100644
index ff62bb9..0000000
--- a/net-scripts/net.modules.d/iptunnel
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void iptunnel_depend(void)
-#
-# Sets up the dependancies for the module
-iptunnel_depend() {
-	before interface
-	functions interface_exists interface_tunnel
-}
-
-# void iptunnel_expose(void)
-#
-# Expose variables that can be configured
-iptunnel_expose() {
-	variables iptunnel
-}
-
-# bool iptunnel_pre_start(char *iface)
-#
-# Create the device, give it the right perms
-iptunnel_pre_start() {
-	local iface="$1" opts ifvar="$(bash_variable "$1")"
-
-	# Get our options
-	eval opts="iptunnel_${ifvar}"
-	[[ -z ${!opts} ]] && return 0
-
-	ebegin "Creating tunnel ${iface}"
-	interface_tunnel add "${iface}" ${!opts}
-	eend "$?"
-}
-
-# bool iptunnel_stop(char *iface)
-#
-# Removes the device
-iptunnel_stop() {
-	local iface="$1"
-
-	# Don't delete sit0 as it's a special tunnel
-	[[ ${iface} == "sit0" ]] && return 0
-	
-	interface_exists "${iface}" || return 0
-	[[ -z $(interface_tunnel show "${iface}" 2>/dev/null) ]] && return 0
-
-	ebegin "Destroying tunnel ${iface}"
-	interface_tunnel del "${iface}"
-	eend $?
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/iptunnel.sh b/net-scripts/net.modules.d/iptunnel.sh
new file mode 100644
index 0000000..ff62bb9
--- /dev/null
+++ b/net-scripts/net.modules.d/iptunnel.sh
@@ -0,0 +1,52 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void iptunnel_depend(void)
+#
+# Sets up the dependancies for the module
+iptunnel_depend() {
+	before interface
+	functions interface_exists interface_tunnel
+}
+
+# void iptunnel_expose(void)
+#
+# Expose variables that can be configured
+iptunnel_expose() {
+	variables iptunnel
+}
+
+# bool iptunnel_pre_start(char *iface)
+#
+# Create the device, give it the right perms
+iptunnel_pre_start() {
+	local iface="$1" opts ifvar="$(bash_variable "$1")"
+
+	# Get our options
+	eval opts="iptunnel_${ifvar}"
+	[[ -z ${!opts} ]] && return 0
+
+	ebegin "Creating tunnel ${iface}"
+	interface_tunnel add "${iface}" ${!opts}
+	eend "$?"
+}
+
+# bool iptunnel_stop(char *iface)
+#
+# Removes the device
+iptunnel_stop() {
+	local iface="$1"
+
+	# Don't delete sit0 as it's a special tunnel
+	[[ ${iface} == "sit0" ]] && return 0
+	
+	interface_exists "${iface}" || return 0
+	[[ -z $(interface_tunnel show "${iface}" 2>/dev/null) ]] && return 0
+
+	ebegin "Destroying tunnel ${iface}"
+	interface_tunnel del "${iface}"
+	eend $?
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/iwconfig b/net-scripts/net.modules.d/iwconfig
deleted file mode 100644
index 0711043..0000000
--- a/net-scripts/net.modules.d/iwconfig
+++ /dev/null
@@ -1,943 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-# Many thanks to all the people in the Gentoo forums for their ideas and
-# motivation for me to make this and keep on improving it
-
-# Fix any potential localisation problems
-# Note that LC_ALL trumps LC_anything_else according to locale(7)
-iwconfig() {
-	LC_ALL=C /sbin/iwconfig "$@"
-}
-iwgetid() {
-	LC_ALL=C /sbin/iwgetid "$@"
-}
-iwlist() {
-	LC_ALL=C /sbin/iwlist "$@"
-}
-iwpriv() {
-	LC_ALL=C /sbin/iwpriv "$@"
-}
-
-# void iwconfig_depend(void)
-#
-# Sets up the dependancies for the module
-iwconfig_depend() {
-	after plug
-	before interface
-	provide wireless
-	functions interface_up interface_down interface_exists
-}
-
-# void iwconfig_expose(void)
-#
-# Expose variables that can be configured
-iwconfig_expose() {
-	variables essid mode associate_timeout sleep_scan preferred_aps blacklist_aps
-}
-
-# bool iwconfig_check_installed(void)
-#
-# Returns 1 if wireless-tools is installed, otherwise 0
-iwconfig_check_installed() {
-	local report=${1:-false}
-	[[ -x /sbin/iwconfig ]] && return 0
-	${report} && eerror "For Wireless (802.11) support, emerge net-wireless/wireless-tools"
-   
-	if [[ ! -e /proc/net/wireless ]]; then
-		installed="1"
-		if ${report} ; then
-			eerror "iwconfig requires wireless support"
-			eerror "(CONFIG_NET_WIRELESS=y) enabled in the kernel"
-		fi
-	fi
-	
-	return 1
-}
-
-# bool iwconfig_exists(char *interface)
-#
-# Checks to see if wireless extensions are enabled on the interface
-iwconfig_exists() {
-	[[ ! -e /proc/net/wireless ]] && return 1
-	grep -q "^[ \t]*$1:[ \t]" /proc/net/wireless
-}
-
-# char* iwconfig_get_wep_status(char *interface)
-#
-# Echos a string showing whether WEP is enabled or disabled
-# for the given interface
-iwconfig_get_wep_status() {
-	local key="$( iwconfig "$1" | grep -i -o "Encryption key:[0-9,A-F]" )"
-	local mode status="disabled"
-
-	if [[ -n ${key} ]]; then
-		status="enabled"
-		mode="$( iwconfig "$1" | sed -n -e 's/^.*Security mode:\(.*[^ ]\).*/\1/p' )"
-		[[ -n ${mode} ]] && mode=" - ${mode}"
-	fi
-
-	echo "(WEP ${status}${mode})"
-}
-
-# char* iwconfig_get_essid(char *iface)
-#
-# Gets the current ESSID of the iface
-iwconfig_get_essid() {
-	local i essid
-
-	for (( i=0; i<5; i++ )); do
-		essid="$( iwgetid --raw "$1" )"
-		if [[ -n ${essid} ]] ; then
-			echo "${essid}"
-			return 0
-		fi
-		sleep 1
-	done
-
-	return 1
-}
-
-# char* iwconfig_get_ap_mac_address(char *interface)
-#
-# Returns the MAC address of the Access Point
-# the interface is connected to
-iwconfig_get_ap_mac_address() {
-	iwgetid --raw --ap "$1"
-}
-
-# char* iwconfig_get_mode(char *interface)
-#
-# Returns the wireless mode in lower case
-iwconfig_get_mode() {
-	iwgetid --mode "$1" | sed -n -e 's/^.*Mode:\(.*\)/\L\1/p'
-}
-
-# char* iwconfig_get_type(char *interface)
-#
-# Returns the type of interface - the IEEE part
-iwconfig_get_type() {
-	iwconfig "$1" | sed -n -e 's/^'"$1"' *\([^ ]* [^ ]*\).*/\1/p'
-}
-
-# void iwconfig_report(char *interface)
-#
-# Output how our wireless interface has been configured
-iwconfig_report() {
-	local iface="$1" essid mac m="connected to"
-
-	essid="$( iwconfig_get_essid "${iface}" )"
-
-	local wep_status="$( iwconfig_get_wep_status "${iface}" )"
-	local channel="$( iwgetid --raw --channel "${iface}" )"
-	[[ -n ${channel} ]] && channel="on channel ${channel} "
-
-	essid="${essid//\\\\/\\\\}"
-	local mode="$( iwconfig_get_mode "${iface}" )"
-	if [[ ${mode} == "master" ]]; then
-		m="configured as"
-	else
-		mac="$( iwconfig_get_ap_mac_address "${iface}" )"
-		[[ -n ${mac} ]] && mac=" at ${mac}"
-	fi
-
-	eindent
-	einfo "${iface} ${m} ESSID \"${essid}\"${mac}"
-	einfo "in ${mode} mode ${channel}${wep_status}"
-	eoutdent
-}
-
-# char* iwconfig_get_wep_key(char *mac_address)
-#
-# Returns the configured WEP key for the given mac address
-# or the given ESSID. The mac address setting takes precendence
-iwconfig_get_wep_key() {
-	local mac="$1" key
-	key="mac_key_${mac//:/}"
-	[[ -z ${!key} ]] && key="key_${ESSIDVAR}"
-	echo "${!key:-off}"
-}
-
-# void iwconfig_user_config(char *iface, char *ifvar)
-#
-# Applies the user configuration to the interface
-iwconfig_user_config() {
-	local iface="$1" conf aconf ifvar="$2"
-	[[ -z ${ifvar} ]] && ifvar="$( bash_variable "$1" )"
-
-	# Apply the user configuration
-	conf="iwconfig_${ifvar}"
-	if [[ -n ${!conf} ]]; then
-		aconf=( "${!conf}" )
-		for conf in "${aconf[@]}" ; do
-			if ! iwconfig "${iface}" ${conf} ; then
-				ewarn "${iface} does not support the following configuration commands"
-				ewarn "  ${conf}"
-			fi
-		done
-	fi
-
-	conf="iwpriv_${ifvar}[@]"
-	if [[ -n ${!conf} ]]; then
-		aconf=( "${!conf}" )
-		for conf in "${aconf[@]}" ; do
-			if ! iwpriv "${iface}" ${conf} ; then
-				ewarn "${iface} does not support the following private ioctls"
-				ewarn "  ${conf}"
-			fi
-		done
-	fi
-}
-
-# bool iwconfig_setup_specific(char *iface)
-#
-# Sets up our wireless interface to operate in ad-hoc or master mode
-iwconfig_setup_specific() {
-	local iface="$1" mode="$2" channel key dessid
-	local ifvar="$( bash_variable "$1" )"
-
-	if [[ -z ${ESSID} ]]; then
-		eerror "${iface} requires an ESSID to be set to operate in ${mode} mode"
-		eerror "adjust the essid_${iface} setting in /etc/conf.d/wireless"
-		return 1
-	fi
-	dessid="${ESSID//\\\\/\\\\}"
-	ESSIDVAR="$( bash_variable "${ESSID}" )"
-	key="$( iwconfig_get_wep_key )"
-
-	# We only change the mode if it's not the same
-	local cur_mode="$( iwconfig_get_mode "${iface}" )"
-	if [[ ${cur_mode} != "${mode}" ]]; then
-		if ! iwconfig "${iface}" mode "${mode}" ; then
-			eerror "${iface} does not support setting the mode to \"${mode}\""
-			return 1
-		fi
-	fi
-
-	channel="channel_${ifvar}"
-	# We default the channel to 3
-	channel="${!channel:-3}"
-	if ! iwconfig "${iface}" channel "${channel}" ; then
-		ewarn "${iface} does not support setting the channel to \"${channel}\""
-		return 1
-	fi
-
-	# Now set the key
-	if ! iwconfig "${iface}" key ${key} ; then
-		if [[ ${key} != "off" ]]; then
-			ewarn "${iface} does not support setting keys"
-			ewarn "or the parameter \"mac_key_${ESSIDVAR}\" or \"key_${ESSIDVAR}\" is incorrect"
-		fi
-	fi
-
-	# Then set the ESSID
-	if ! iwconfig "${iface}" essid "${ESSID}" ; then
-		eerror "${iface} does not support setting ESSID to \"${dessid}\""
-		return 1
-	fi
-
-	# Finally apply the user Config
-	iwconfig_user_config "${iface}" "${ESSIDVAR}"
-	
-	iwconfig_report "${iface}"
-
-	return 0
-}
-
-# bool iwconfig_associate_mac(char *iface)
-#
-# Returns true if the AP MAC address is valid or not
-iwconfig_associate_mac() {
-	# Checks if a MAC address has been assigned
-	local mac="$( iwconfig_get_ap_mac_address "$1" )" i
-	local -a invalid_macs=(
-		"00:00:00:00:00:00"
-		"44:44:44:44:44:44"
-		"FF:00:00:00:00:00" 
-		"FF:FF:FF:FF:FF:FF"
-	)
-
-	[[ -z ${mac} ]] && return 1
-	for i in "${invalid_macs[@]}"; do
-		[[ ${mac} == "${i}" ]] && return 1
-	done
-	return 0
-}
-
-# bool iwconfig_associate_quality(char *iface)
-#
-# Returns true if the link quality is not 0 or 0.
-iwconfig_associate_quality() {
-	local quality="$( \
-		sed -n -e 's/^.*'"$1"': *[0-9]* *\([0-9]*\).*/\1/p' \
-		/proc/net/wireless
-	)"
-	[[ ${quality} != "0" ]]
-	return "$?"
-}
-
-# bool iwconfig_test_associated(char *iface)
-#
-# Returns true if the interface has associated with an Access Point
-iwconfig_test_associated() {
-	local iface="$1" ttype ifvar="$( bash_variable "$1" )" x
-	# Some drivers don't set MAC to a bogus value when assocation is lost/fails
-	# whereas they do set link quality to 0
-
-	x="associate_test_${ifvar}"
-	ttype="$( echo "${!x:-mac}" | tr '[:upper:]' '[:lower:]' )"
-	if [[ ${ttype} != "mac" && ${ttype} != "quality" && ${ttype} != "all" ]]; then
-		ewarn "  associate_test_${iface} is not set to mac, quality or all"
-		ewarn "  defaulting to \"mac\""
-		test="mac"
-	fi
-
-	case "${ttype}" in
-		mac) iwconfig_associate_mac "${iface}" && return 0 ;;
-		quality) iwconfig_associate_quality "${iface}" && return 0 ;;
-		all) iwconfig_associate_mac "${iface}" \
-			&& iwconfig_associate_quality "${iface}" && return 0 ;;
-	esac
-
-	return 1
-}
-
-# bool iwconfig_wait_for_association(char *iface)
-#
-# Waits for a configured ammount of time until
-# we are assocaited with an Access Point
-iwconfig_wait_for_association() {
-	local iface="$1" i=0 timeout ifvar="$( bash_variable "$1" )"
-	timeout="associate_timeout_${ifvar}"
-	[[ -z ${!timeout} ]] && timeout="sleep_associate_${ifvar}"
-	timeout="${!timeout:-10}"
-
-	[[ ${timeout} == "0" ]] \
-		&& vewarn "WARNING: infinite timeout set for association on ${iface}"
-
-	while true; do
-		iwconfig_test_associated "${iface}" && return 0
-		sleep 1
-		[[ ${timeout} == "0" ]] && continue
-		(( i++ ))
-		[[ ${i} == "${timeout}" || ${i} -gt ${timeout} ]] && break
-	done
-	return 1
-}
-
-# bool iwconfig_associate(char *interface, char *mac_address, char *wep_required)
-#
-# Tries to associate the interface with an Access Point
-# If we scanned the Access Point we know if we need WEP to associate or not
-# and if we have a WEP key for the ESSID or not
-# so we can fail gracefully without even trying to connect
-iwconfig_associate() {
-	local iface="$1" mode="${2:-managed}"
-	local mac="$3" wep_required="$4" w="(WEP Disabled)"
-	local dessid="${ESSID//\\\\/\\\\}" key
-
-	if ! iwconfig "${iface}" mode "${mode}" ; then
-		eerror "Unable to change mode to ${mode}"
-		return 1
-	fi
-
-	if [[ ${ESSID} == "any" ]]; then
-		iwconfig "${iface}" ap any 2>/dev/null
-		dessid="any"
-		unset ESSIDVAR
-	else
-		ESSIDVAR="$( bash_variable "${ESSID}" )"
-		key="$( iwconfig_get_wep_key "${mac}" )"
-		if [[ ${wep_required} == "on" && ${key} == "off" ]]; then
-			eerror "WEP key is not set for \"${dessid}\" - not connecting"
-			return 1
-		fi
-		if [[ ${wep_required} == "off" && ${key} != "off" ]]; then
-			key="off"
-			ewarn "\"${dessid}\" is not WEP enabled - ignoring setting"
-		fi
-
-		if ! iwconfig "${iface}" key ${key} ; then
-			if [[ ${key} != "off" ]]; then
-				ewarn "${iface} does not support setting keys"
-				ewarn "or the parameter \"mac_key_${ESSIDVAR}\" or \"key_${ESSIDVAR}\" is incorrect"
-				return 1
-			fi
-		fi
-		[[ ${key} != "off" ]] && w="$( iwconfig_get_wep_status "${iface}" )"
-	fi
-
-	if ! iwconfig "${iface}" essid "${ESSID}" ; then
-		if [[ ${ESSID} != "any" ]]; then
-			ewarn "${iface} does not support setting ESSID to \"${dessid}\""
-		fi
-	fi
-
-	# Finally apply the user Config
-	iwconfig_user_config "${iface}" "${ESSIDVAR}"
-
-	vebegin "Connecting to \"${dessid}\" in ${mode} mode ${w}"
-
-	if [[ ${ESSID} != "any" ]] && is_function preassociate ; then
-		veinfo "Running preassociate function"
-		eindent
-		( preassociate "${iface}" )
-		e="$?"
-		eoutdent
-		if [[ ${e} != 0 ]]; then
-			veend 1 "preassociate \"${dessid}\" on ${iface} failed"
-			return 1
-		fi
-	fi
-
-	if ! iwconfig_wait_for_association "${iface}" ; then
-		veend 1
-		return 1
-	fi
-	veend 0
-
-	if [[ ${ESSID} == "any" ]]; then
-		ESSID="$( iwconfig_get_essid "${iface}" )"
-		iwconfig_associate "${iface}"
-		return $?
-	fi
-
-	iwconfig_report "${iface}"
-
-	if is_function postassociate ; then
-		veinfo "Running postassociate function"
-		eindent
-		( postassociate "${iface}" )
-		eoutdent
-	fi
-
-	return 0
-}
-
-# bool iwconfig_scan(char *iface)
-#
-# Fills 3 arrays with information from a wireless scan
-iwconfig_scan() {
-	local iface="$1" mode x ifvar="$( bash_variable "$1" )"
-
-	# First, we may need to change mode to scan in
-	x="scan_mode_${ifvar}"
-	mode="$( echo "${!x}" | tr '[:upper:]' '[:lower:]' )"
-	if [[ -n ${mode} ]]; then
-		if ! iwconfig "${iface}" mode "${mode}" ; then
-			ewarn "${iface} does not support setting the mode to \"${mode}\""
-		fi
-	fi
-
-	# Next we set any private driver ioctls needed
-	x="iwpriv_scan_pre_${ifvar}"
-	if [[ -n ${!x} ]]; then
-		if ! eval iwpriv "${iface}" "${!x}" ; then
-			ewarn "${iface} does not support the following private ioctls" \
-			ewarn "  ${!x}"
-		fi
-	fi
-
-	# Set the essid to any. This is required for scanning
-	iwconfig "${iface}" essid any
-	
-	veinfo "Scanning for access points"
-
-	# Sleep if required
-	x="sleep_scan_${ifvar}"
-	[[ -z ${!x} || ${!x} -gt 0 ]] && sleep "${!x:-1}"
-
-	local error=true i=-1 line
-	local -a mac essid enc qual mode
-
-	while read line; do
-		error=false
-		case "${line}" in
-			*Address:*)
-				(( i++ ))
-				mac[i]="$( echo "${line#*: }" | tr '[:lower:]' '[:upper:]' )"
-				;;
-			*ESSID:*)
-				essid[i]="${line#*\"}"
-				essid[i]="${essid[i]%*\"}"
-				;;
-			*Mode:*)
-				mode[i]="$(echo "${line#*:}" | tr '[:upper:]' '[:lower:]' )"
-				[[ ${mode[i]} == "master" ]] && mode[i]="managed"
-				;;
-			*'Encryption key:'*)
-				enc[i]="${line#*:}"
-				;;
-			*Quality*)
-				qual[i]="${line#*:}"
-				qual[i]="${qual[i]%/*}"
-				qual[i]="${qual[i]//[![:digit:]]/}"
-				qual[i]="${qual[i]:-0}"
-				;;
-		esac
-	done < <( iwlist "${iface}" scan 2>/dev/null )
-
-	if ${error}; then
-		ewarn "${iface} does not support scanning"
-		x="adhoc_essid_${ifvar}"
-		[[ -n ${!x} ]] && return 0
-		if [[ -n ${preferred_aps} ]]; then
-			[[ ${associate_order} == "forcepreferred" \
-			|| ${associate_order} == "forcepreferredonly" ]] && return 0
-		fi
-		eerror "You either need to set a preferred_aps list in /etc/conf.d/wireless"
-		eerror "   preferred_aps=( \"ESSID1\" \"ESSID2\" )"
-		eerror "   and set associate_order_${iface}=\"forcepreferred\""
-		eerror "   or set associate_order_${iface}=\"forcepreferredonly\""
-		eerror "or hardcode the ESSID to \"any\" and let the driver find an Access Point"
-		eerror "   essid_${iface}=\"any\""
-		eerror "or configure defaulting to Ad-Hoc when Managed fails"
-		eerror "   adhoc_essid_${iface}=\"WLAN\""
-		eerror "or hardcode the ESSID against the interface (not recommended)"
-		eerror "   essid_${iface}=\"ESSID\""
-		return 1
-	fi
-
-	# We may need to unset the previous private driver ioctls
-	x="iwpriv_scan_post_${ifvar}"
-	if [[ -n ${!x} ]]; then
-		if ! eval iwpriv "${iface}" "${!x}" ; then
-			ewarn "${iface} does not support the following private ioctls" \
-			ewarn "  ${!x}"
-		fi
-	fi
-
-	# Change back mode if needed
-	x="mode_${ifvar}"
-	x="$( echo "${!x:-managed}" | tr '[:upper:]' '[:lower:]' )"
-	[[ ${mode} != "${x}" ]] && iwconfig "${iface}" mode "${x}"
-
-	# Strip any duplicates
-	local i j x="${#mac[@]}" y
-	for (( i=0; i<x-1; i++ )) ; do
-		[[ -z ${mac[i]} ]] && continue
-		for (( j=i+1; j<x; j++)) ; do
-			if [[ ${mac[i]} == "${mac[j]}" ]] ; then
-				if [[ ${qual[i]} -gt ${qual[j]} ]] ; then
-					y="${j}"
-				else
-					y="${j}"
-				fi
-				unset mac[y]
-				unset qual[y]
-				unset essid[y]
-				unset mode[y]
-				unset enc[y]
-			fi
-		done
-	done
-	mac=( "${mac[@]}" )
-	qual=( "${qual[@]}" )
-	essid=( "${essid[@]}" )
-	mode=( "${mode[@]}" )
-	enc=( "${enc[@]}" )
-
-	for (( i=0; i<${#mac[@]}; i++ )); do
-		# Don't like ad-hoc nodes by default
-		[[ ${mode[i]} == "ad-hoc" ]] && (( qual[i]-=10000 ))
-		sortline="${sortline}${qual[i]} ${i}\n"
-	done
-
-	sortline=( $( echo -e "${sortline}" | sort -nr ) )
-
-	for (( i=0; i<${#mac[@]}; i++ )); do
-		(( x=(i * 2) + 1 ))
-		mac_APs[i]="${mac[${sortline[x]}]}"
-		essid_APs[i]="${essid[${sortline[x]}]}"
-		mode_APs[i]="${mode[${sortline[x]}]}"
-		enc_APs[i]="${enc[${sortline[x]}]}"
-	done
-
-	return 0
-}
-
-# void iwconfig_scan_report(void)
-#
-# Report the results of the scan and re-map any ESSIDs if they
-# have been configured for the MAC address found
-iwconfig_scan_report() {
-	local i k m remove
-	local -a u
-
-	[[ -z ${mac_APs} ]] && ewarn "  no access points found"
-
-	# We need to do the for loop like this so we can
-	# dynamically remove from the array
-	eindent
-	for ((i=0; i<${#mac_APs[@]}; i++)); do
-		k="(${mode_APs[i]}"
-		[[ ${enc_APs[i]} != "off" ]] && k="${k}, encrypted"
-		k="${k})"
-
-		if [[ -z ${essid_APs[i]} ]]; then
-			veinfo "Found ${mac_APs[i]} ${k}"
-		else
-			veinfo "Found \"${essid_APs[i]//\\\\/\\\\}\" at ${mac_APs[i]} ${k}"
-		fi
-
-		eindent
-
-		m="mac_essid_${mac_APs[i]//:/}"
-		if [[ -n ${!m} ]]; then
-			essid_APs[i]="${!m}"
-			veinfo "mapping to \"${!m//\\\\/\\\\}\""
-		fi
-
-		remove=false
-		# If we don't know the essid then we cannot connect to them
-		# so we remove them from our array
-		if [[ -z ${essid_APs[i]} ]]; then
-			remove=true
-		else
-			for k in "${blacklist_aps[@]}"; do
-				if [[ ${k} == "${essid_APs[i]}" ]]; then
-					vewarn "\"${k//\\\\/\\\\}\" has been blacklisted - not connecting"
-					remove=true
-					break
-				fi
-			done
-		fi
-
-		eoutdent
-
-		${remove} && u=( "${u[@]}" "${i}" )
-	done
-
-	eoutdent
-
-	# Now we remove any duplicates
-	for ((i=0; i < ${#essid_APs[@]} - 1; i++)); do
-		for ((j=${i} + 1; j <${#essid_APs[@]}; j++)); do
-			[[ ${essid_APs[i]} == "${essid_APs[j]}" ]] && u=( "${u[@]}" "${j}" )
-		done
-	done
-
-	for i in ${u[@]}; do
-		unset essid_APs[i]
-		unset mode_APs[i]
-		unset mac_APs[i]
-		unset enc_APs[i]
-	done
-
-	# We need to squash our arrays so indexes work again
-	essid_APs=( "${essid_APs[@]}" )
-	mode_APs=( "${mode_APs[@]}" )
-	mac_APs=( "${mac_APs[@]}" )
-	enc_APs=( "${enc_APs[@]}" )
-}
-
-# bool iwconfig_force_preferred(char *iface)
-#
-# Forces the preferred_aps list to associate in order
-# but only if they were not picked up by our scan
-iwconfig_force_preferred() {
-	local iface=$1 essid i
-
-	[[ -z ${preferred_aps} ]] && return 1
-
-	ewarn "Trying to force preferred in case they are hidden"
-	for essid in "${preferred_aps[@]}"; do
-		local found_AP=false
-		for ((i = 0; i < ${#mac_APs[@]}; i++)); do
-			if [[ ${essid} == "${essid_APs[i]}" ]]; then
-				found_AP=true
-				break
-			fi
-		done
-		if ! ${found_AP} ; then
-			ESSID="${essid}"
-			iwconfig_associate "${iface}" && return 0
-		fi
-	done
-
-	ewarn "Failed to associate with any preferred access points on ${iface}"
-	return 1
-}
-
-# bool iwconfig_connect_preferred(char *iface)
-#
-# Connects to preferred_aps in order if they were picked up
-# by our scan
-iwconfig_connect_preferred() {
-	local iface="$1" essid i
-
-	for essid in "${preferred_aps[@]}"; do
-		for ((i=0; i<${#essid_APs[@]}; i++)); do
-			if [[ ${essid} == "${essid_APs[i]}" ]]; then
-				ESSID="${essid}"
-				iwconfig_associate "${iface}" "${mode_APs[i]}" "${mac_APs[i]}" \
-					"${enc_APs[i]}" && return 0
-				break
-			fi
-		done
-	done
-
-	return 1
-}
-
-# bool iwconfig_connect_not_preferred(char *iface)
-#
-# Connects to any AP's found that are not in
-# our preferred list
-iwconfig_connect_not_preferred() {
-	local iface=$1 i ap has_preferred
-
-	for ((i=0; i<${#mac_APs[@]}; i++)); do
-		has_preferred=false
-		for ap in "${preferred_aps[@]}"; do
-			if [[ ${ap} == "${essid_APs[i]}" ]]; then
-				has_preferred=true
-				break
-			fi
-		done
-		if ! ${has_preferred} ; then
-			ESSID="${essid_APs[i]}"
-			iwconfig_associate "${iface}" "${mode_APs[i]}" "${mac_APs[i]}" \
-				"${enc_APs[i]}" && return 0
-		fi
-	done
-
-	return 1
-}
-
-# void iwconfig_defaults(char *iface)
-#
-# Apply some sane defaults to the wireless interface
-# incase the user already applied some changes
-iwconfig_defaults() {
-	local iface="$1"
-
-	# Set some defaults
-	iwconfig "${iface}" rate auto 2>/dev/null
-	iwconfig "${iface}" rts auto 2>/dev/null
-	iwconfig "${iface}" frag auto 2>/dev/null
-	iwconfig "${iface}" txpower auto 2>/dev/null
-
-}
-
-# void iwconfig_strip_associated(char *iface)
-#
-# We check to see which ifaces have associated AP's except for the iface
-# given and remove those AP's from the scan list
-# We also remove from the preferred list
-iwconfig_strip_associated() {
-	local iface="$1" e a j
-	local essid="$( iwconfig_get_essid "${iface}" )"
-	local -a ifaces=( $( iwconfig 2>/dev/null | grep -o "^\w*" ) )
-
-	for i in "${ifaces[@]}"; do
-		[[ ${i} == ${iface} ]] && continue
-		interface_is_up "${i}" || continue
-		iwconfig_test_associated "${i}" || continue
-		e="$( iwconfig_get_essid "${i}" )"
-		local -a u=()
-		for ((j=0; j<${#mac_APs[@]}; j++)); do
-			if [[ ${essid_APs[j]} == "${e}" ]]; then
-				ewarn "${e} has already been associated with ${i}"
-				unset essid_APs[j]
-				unset mode_Aps[j]
-				unset mac_APs[j]
-				unset enc_APs[j]
-				# We need to squash our arrays so that indexes work
-				essid_APs=( "${essid_APs[@]}" )
-				mode_APs=( "${mode_APs[@]}" )
-				mac_APs=( "${mac_APs[@]}" )
-				enc_APs=( "${enc_APs[@]}" )
-				break
-			fi
-		done
-		for ((j=0; j<${#preferred_aps[@]}; j++)); do
-			if [[ ${preferred_aps[j]} == "${e}" ]]; then
-				unset preferred_aps[j]
-				preferred_aps=( "${preferred_aps[@]}" )
-				break
-			fi
-		done
-	done
-}
-
-# bool iwconfig_configure(char *iface)
-#
-# The main startup code
-# First we bring the interface up, apply defaults, apply user configuration
-# Then we test to see if ad-hoc mode has been requested and branch if needed
-# Then we scan for access points and try to connect to them in a predetermined order
-# Once we're connected we show a report and then configure any interface
-# variables for the ESSID
-iwconfig_configure() {
-	local iface="$1" test x e ifvar="$( bash_variable "$1" )"
-	local -a essid_APs mac_APs mode_APs enc_APs
-
-	iwconfig_defaults "${iface}"
-	iwconfig_user_config "${iface}"
-
-	ESSID="essid_${ifvar}"
-	ESSID="${!ESSID}"
-
-	# Setup ad-hoc mode?
-	x="mode_${ifvar}"
-	x="$( echo "${!x:-managed}" | tr '[:upper:]' '[:lower:]' )"
-	if [[ ${x} == "ad-hoc" || ${x} == "master" ]]; then
-		iwconfig_setup_specific "${iface}" "${x}"
-		return $?
-	fi
-
-	if [[ ${x} != "managed" && ${x} != "auto" ]]; then
-		eerror "Only managed, ad-hoc, master and auto modes are supported"
-		return 1
-	fi
-
-	# We only change the mode if it's not the same as some drivers
-	# only do managed and throw an error changing to managed
-	local cur_mode="$( iwconfig_get_mode "${iface}" )"
-	if [[ ${cur_mode} != "${x}" ]]; then
-		if ! iwconfig "${iface}" mode "${x}" ; then
-			eerror "${iface} does not support setting the mode to \"${x}\""
-			return 1
-		fi
-	fi
-
-	# These arrays hold the results of our scan
-	local -a mac_APs essid_APs enc_APs
-
-	# Has an ESSID been forced?
-	if [[ -n ${ESSID} ]]; then
-		iwconfig_associate "${iface}" && return 0
-		[[ ${ESSID} == "any" ]] && iwconfig_force_preferred "${iface}" && return 0
-
-		ESSID="adhoc_essid_${ifvar}"
-		ESSID="${!ESSID}"
-		if [[ -n ${ESSID} ]]; then
-			iwconfig_setup_specific "${iface}" ad-hoc
-			return $?
-		fi
-		return 1
-	fi
-
-	# Do we have a preferred Access Point list specific to the interface?
-	x="preferred_aps_${ifvar}[@]"
-	[[ -n ${!x} ]] && preferred_aps=( "${!x}" )
-
-	# Do we have a blacklist Access Point list specific to the interface?
-	x="blacklist_aps_${ifvar}[@]"
-	[[ -n ${!x} ]] && blacklist_aps=( "${!x}" )
-
-	# Are we forcing preferred only?
-	x="associate_order_${ifvar}"
-	[[ -n ${!x} ]] && associate_order="${!x}"
-	associate_order="$(
-		echo "${associate_order:-any}" \
-		| tr '[:upper:]' '[:lower:]'
-	)"
-
-	if [[ ${associate_order} == "forcepreferredonly" ]]; then
-		iwconfig_force_preferred "${iface}" && return 0
-	else
-		iwconfig_scan "${iface}" || return 1
-		iwconfig_scan_report
-
-		# Strip AP's from the list that have already been associated with
-		# other wireless cards in the system if requested
-		x="unique_ap_${ifvar}"
-		[[ -n ${!x} ]] && unique_ap="${!x}"
-		unique_ap="$( echo "${unique_ap:-no}" | tr '[:upper:]' '[:lower:]' )"
-		[[ ${unique_ap} != "no" ]] && iwconfig_strip_associated "${iface}"
-
-		iwconfig_connect_preferred "${iface}" && return 0
-		[[ ${associate_order} == "forcepreferred" \
-			|| ${associate_order} == "forceany" ]] \
-			&& iwconfig_force_preferred "${iface}" && return 0
-		[[ ${associate_order} == "any" || ${associate_order} == "forceany" ]] \
-			&& iwconfig_connect_not_preferred "${iface}" && return 0
-	fi
-
-	e="associate with"
-	[[ -z ${mac_APs} ]] && e="find"
-	[[ ${preferred_only} == "force" || ${preferred_aps} == "forceonly" ]] \
-		&& e="force"
-	e="Couldn't ${e} any access points on ${iface}"
-
-	ESSID="adhoc_essid_${ifvar}"
-	ESSID="${!ESSID}"
-	if [[ -n ${ESSID} ]]; then
-		ewarn "${e}"
-		iwconfig_setup_specific "${iface}" ad-hoc
-		return $?
-	fi
-
-	eerror "${e}"
-	return 1
-}
-
-# bool iwconfig_pre_start(char *iface)
-#
-# Start entry point
-# First we check if wireless extensions exist on the interface
-# If they are then we configue wireless
-iwconfig_pre_start() {
-	local iface="$1" r=0
-
-	# We don't configure wireless if we're being called from
-	# the background
-	${IN_BACKGROUND} && return 0
-
-	save_options "ESSID" ""
-	interface_exists "${iface}" || return 0
-
-	# We need to bring the interface up, as some cards do not register
-	# in /proc/wireless until they are brought up.
-	interface_up "${iface}"
-
-	if ! iwconfig_exists "${iface}" ; then
-		veinfo "Wireless extensions not found for ${iface}"
-		return 0
-	fi
-
-	# Check for rf_kill - only ipw supports this at present, but other
-	# cards may in the future.
-	if [[ -e "/sys/class/net/${iface}/device/rf_kill" ]]; then
-		if [[ $( < "/sys/class/net/${iface}/device/rf_kill" ) != 0 ]]; then
-			eerror "Wireless radio has been killed for interface ${iface}"
-			return 1
-		fi
-	fi
-
-	einfo "Configuring wireless network for ${iface}"
-
-	# Are we a proper IEEE device?
-	# Most devices reutrn IEEE 802.11b/g - but intel cards return IEEE in lower case
-	# and RA cards return RAPCI or similar which really sucks :(
-	# For the time being, we will test prism54 not loading firmware which reports
-	# NOT READY!
-	x="$( iwconfig_get_type "${iface}" )"
-	if [[ ${x} == "NOT READY!" ]]; then
-		eerror "Looks like there was a probem loading the firmware for ${iface}"
-		return 1
-	fi
-
-	# Setup IFS incase parent script has modified it
-	local IFS=$' '$'\n'$'\t'
-
-	if iwconfig_configure "${iface}" ; then
-		save_options "ESSID" "${ESSID}"
-		return 0
-	fi
-
-	eerror "Failed to configure wireless for ${iface}"
-	iwconfig_defaults "${iface}"
-	unset ESSID ESSIDVAR
-	interface_down "${iface}"
-	return 1
-}
-
-iwconfig_post_stop() {
-	interface_exists "${iface}" || return 0
-	iwconfig_defaults "${iface}" 
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/iwconfig.sh b/net-scripts/net.modules.d/iwconfig.sh
new file mode 100644
index 0000000..0711043
--- /dev/null
+++ b/net-scripts/net.modules.d/iwconfig.sh
@@ -0,0 +1,943 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+# Many thanks to all the people in the Gentoo forums for their ideas and
+# motivation for me to make this and keep on improving it
+
+# Fix any potential localisation problems
+# Note that LC_ALL trumps LC_anything_else according to locale(7)
+iwconfig() {
+	LC_ALL=C /sbin/iwconfig "$@"
+}
+iwgetid() {
+	LC_ALL=C /sbin/iwgetid "$@"
+}
+iwlist() {
+	LC_ALL=C /sbin/iwlist "$@"
+}
+iwpriv() {
+	LC_ALL=C /sbin/iwpriv "$@"
+}
+
+# void iwconfig_depend(void)
+#
+# Sets up the dependancies for the module
+iwconfig_depend() {
+	after plug
+	before interface
+	provide wireless
+	functions interface_up interface_down interface_exists
+}
+
+# void iwconfig_expose(void)
+#
+# Expose variables that can be configured
+iwconfig_expose() {
+	variables essid mode associate_timeout sleep_scan preferred_aps blacklist_aps
+}
+
+# bool iwconfig_check_installed(void)
+#
+# Returns 1 if wireless-tools is installed, otherwise 0
+iwconfig_check_installed() {
+	local report=${1:-false}
+	[[ -x /sbin/iwconfig ]] && return 0
+	${report} && eerror "For Wireless (802.11) support, emerge net-wireless/wireless-tools"
+   
+	if [[ ! -e /proc/net/wireless ]]; then
+		installed="1"
+		if ${report} ; then
+			eerror "iwconfig requires wireless support"
+			eerror "(CONFIG_NET_WIRELESS=y) enabled in the kernel"
+		fi
+	fi
+	
+	return 1
+}
+
+# bool iwconfig_exists(char *interface)
+#
+# Checks to see if wireless extensions are enabled on the interface
+iwconfig_exists() {
+	[[ ! -e /proc/net/wireless ]] && return 1
+	grep -q "^[ \t]*$1:[ \t]" /proc/net/wireless
+}
+
+# char* iwconfig_get_wep_status(char *interface)
+#
+# Echos a string showing whether WEP is enabled or disabled
+# for the given interface
+iwconfig_get_wep_status() {
+	local key="$( iwconfig "$1" | grep -i -o "Encryption key:[0-9,A-F]" )"
+	local mode status="disabled"
+
+	if [[ -n ${key} ]]; then
+		status="enabled"
+		mode="$( iwconfig "$1" | sed -n -e 's/^.*Security mode:\(.*[^ ]\).*/\1/p' )"
+		[[ -n ${mode} ]] && mode=" - ${mode}"
+	fi
+
+	echo "(WEP ${status}${mode})"
+}
+
+# char* iwconfig_get_essid(char *iface)
+#
+# Gets the current ESSID of the iface
+iwconfig_get_essid() {
+	local i essid
+
+	for (( i=0; i<5; i++ )); do
+		essid="$( iwgetid --raw "$1" )"
+		if [[ -n ${essid} ]] ; then
+			echo "${essid}"
+			return 0
+		fi
+		sleep 1
+	done
+
+	return 1
+}
+
+# char* iwconfig_get_ap_mac_address(char *interface)
+#
+# Returns the MAC address of the Access Point
+# the interface is connected to
+iwconfig_get_ap_mac_address() {
+	iwgetid --raw --ap "$1"
+}
+
+# char* iwconfig_get_mode(char *interface)
+#
+# Returns the wireless mode in lower case
+iwconfig_get_mode() {
+	iwgetid --mode "$1" | sed -n -e 's/^.*Mode:\(.*\)/\L\1/p'
+}
+
+# char* iwconfig_get_type(char *interface)
+#
+# Returns the type of interface - the IEEE part
+iwconfig_get_type() {
+	iwconfig "$1" | sed -n -e 's/^'"$1"' *\([^ ]* [^ ]*\).*/\1/p'
+}
+
+# void iwconfig_report(char *interface)
+#
+# Output how our wireless interface has been configured
+iwconfig_report() {
+	local iface="$1" essid mac m="connected to"
+
+	essid="$( iwconfig_get_essid "${iface}" )"
+
+	local wep_status="$( iwconfig_get_wep_status "${iface}" )"
+	local channel="$( iwgetid --raw --channel "${iface}" )"
+	[[ -n ${channel} ]] && channel="on channel ${channel} "
+
+	essid="${essid//\\\\/\\\\}"
+	local mode="$( iwconfig_get_mode "${iface}" )"
+	if [[ ${mode} == "master" ]]; then
+		m="configured as"
+	else
+		mac="$( iwconfig_get_ap_mac_address "${iface}" )"
+		[[ -n ${mac} ]] && mac=" at ${mac}"
+	fi
+
+	eindent
+	einfo "${iface} ${m} ESSID \"${essid}\"${mac}"
+	einfo "in ${mode} mode ${channel}${wep_status}"
+	eoutdent
+}
+
+# char* iwconfig_get_wep_key(char *mac_address)
+#
+# Returns the configured WEP key for the given mac address
+# or the given ESSID. The mac address setting takes precendence
+iwconfig_get_wep_key() {
+	local mac="$1" key
+	key="mac_key_${mac//:/}"
+	[[ -z ${!key} ]] && key="key_${ESSIDVAR}"
+	echo "${!key:-off}"
+}
+
+# void iwconfig_user_config(char *iface, char *ifvar)
+#
+# Applies the user configuration to the interface
+iwconfig_user_config() {
+	local iface="$1" conf aconf ifvar="$2"
+	[[ -z ${ifvar} ]] && ifvar="$( bash_variable "$1" )"
+
+	# Apply the user configuration
+	conf="iwconfig_${ifvar}"
+	if [[ -n ${!conf} ]]; then
+		aconf=( "${!conf}" )
+		for conf in "${aconf[@]}" ; do
+			if ! iwconfig "${iface}" ${conf} ; then
+				ewarn "${iface} does not support the following configuration commands"
+				ewarn "  ${conf}"
+			fi
+		done
+	fi
+
+	conf="iwpriv_${ifvar}[@]"
+	if [[ -n ${!conf} ]]; then
+		aconf=( "${!conf}" )
+		for conf in "${aconf[@]}" ; do
+			if ! iwpriv "${iface}" ${conf} ; then
+				ewarn "${iface} does not support the following private ioctls"
+				ewarn "  ${conf}"
+			fi
+		done
+	fi
+}
+
+# bool iwconfig_setup_specific(char *iface)
+#
+# Sets up our wireless interface to operate in ad-hoc or master mode
+iwconfig_setup_specific() {
+	local iface="$1" mode="$2" channel key dessid
+	local ifvar="$( bash_variable "$1" )"
+
+	if [[ -z ${ESSID} ]]; then
+		eerror "${iface} requires an ESSID to be set to operate in ${mode} mode"
+		eerror "adjust the essid_${iface} setting in /etc/conf.d/wireless"
+		return 1
+	fi
+	dessid="${ESSID//\\\\/\\\\}"
+	ESSIDVAR="$( bash_variable "${ESSID}" )"
+	key="$( iwconfig_get_wep_key )"
+
+	# We only change the mode if it's not the same
+	local cur_mode="$( iwconfig_get_mode "${iface}" )"
+	if [[ ${cur_mode} != "${mode}" ]]; then
+		if ! iwconfig "${iface}" mode "${mode}" ; then
+			eerror "${iface} does not support setting the mode to \"${mode}\""
+			return 1
+		fi
+	fi
+
+	channel="channel_${ifvar}"
+	# We default the channel to 3
+	channel="${!channel:-3}"
+	if ! iwconfig "${iface}" channel "${channel}" ; then
+		ewarn "${iface} does not support setting the channel to \"${channel}\""
+		return 1
+	fi
+
+	# Now set the key
+	if ! iwconfig "${iface}" key ${key} ; then
+		if [[ ${key} != "off" ]]; then
+			ewarn "${iface} does not support setting keys"
+			ewarn "or the parameter \"mac_key_${ESSIDVAR}\" or \"key_${ESSIDVAR}\" is incorrect"
+		fi
+	fi
+
+	# Then set the ESSID
+	if ! iwconfig "${iface}" essid "${ESSID}" ; then
+		eerror "${iface} does not support setting ESSID to \"${dessid}\""
+		return 1
+	fi
+
+	# Finally apply the user Config
+	iwconfig_user_config "${iface}" "${ESSIDVAR}"
+	
+	iwconfig_report "${iface}"
+
+	return 0
+}
+
+# bool iwconfig_associate_mac(char *iface)
+#
+# Returns true if the AP MAC address is valid or not
+iwconfig_associate_mac() {
+	# Checks if a MAC address has been assigned
+	local mac="$( iwconfig_get_ap_mac_address "$1" )" i
+	local -a invalid_macs=(
+		"00:00:00:00:00:00"
+		"44:44:44:44:44:44"
+		"FF:00:00:00:00:00" 
+		"FF:FF:FF:FF:FF:FF"
+	)
+
+	[[ -z ${mac} ]] && return 1
+	for i in "${invalid_macs[@]}"; do
+		[[ ${mac} == "${i}" ]] && return 1
+	done
+	return 0
+}
+
+# bool iwconfig_associate_quality(char *iface)
+#
+# Returns true if the link quality is not 0 or 0.
+iwconfig_associate_quality() {
+	local quality="$( \
+		sed -n -e 's/^.*'"$1"': *[0-9]* *\([0-9]*\).*/\1/p' \
+		/proc/net/wireless
+	)"
+	[[ ${quality} != "0" ]]
+	return "$?"
+}
+
+# bool iwconfig_test_associated(char *iface)
+#
+# Returns true if the interface has associated with an Access Point
+iwconfig_test_associated() {
+	local iface="$1" ttype ifvar="$( bash_variable "$1" )" x
+	# Some drivers don't set MAC to a bogus value when assocation is lost/fails
+	# whereas they do set link quality to 0
+
+	x="associate_test_${ifvar}"
+	ttype="$( echo "${!x:-mac}" | tr '[:upper:]' '[:lower:]' )"
+	if [[ ${ttype} != "mac" && ${ttype} != "quality" && ${ttype} != "all" ]]; then
+		ewarn "  associate_test_${iface} is not set to mac, quality or all"
+		ewarn "  defaulting to \"mac\""
+		test="mac"
+	fi
+
+	case "${ttype}" in
+		mac) iwconfig_associate_mac "${iface}" && return 0 ;;
+		quality) iwconfig_associate_quality "${iface}" && return 0 ;;
+		all) iwconfig_associate_mac "${iface}" \
+			&& iwconfig_associate_quality "${iface}" && return 0 ;;
+	esac
+
+	return 1
+}
+
+# bool iwconfig_wait_for_association(char *iface)
+#
+# Waits for a configured ammount of time until
+# we are assocaited with an Access Point
+iwconfig_wait_for_association() {
+	local iface="$1" i=0 timeout ifvar="$( bash_variable "$1" )"
+	timeout="associate_timeout_${ifvar}"
+	[[ -z ${!timeout} ]] && timeout="sleep_associate_${ifvar}"
+	timeout="${!timeout:-10}"
+
+	[[ ${timeout} == "0" ]] \
+		&& vewarn "WARNING: infinite timeout set for association on ${iface}"
+
+	while true; do
+		iwconfig_test_associated "${iface}" && return 0
+		sleep 1
+		[[ ${timeout} == "0" ]] && continue
+		(( i++ ))
+		[[ ${i} == "${timeout}" || ${i} -gt ${timeout} ]] && break
+	done
+	return 1
+}
+
+# bool iwconfig_associate(char *interface, char *mac_address, char *wep_required)
+#
+# Tries to associate the interface with an Access Point
+# If we scanned the Access Point we know if we need WEP to associate or not
+# and if we have a WEP key for the ESSID or not
+# so we can fail gracefully without even trying to connect
+iwconfig_associate() {
+	local iface="$1" mode="${2:-managed}"
+	local mac="$3" wep_required="$4" w="(WEP Disabled)"
+	local dessid="${ESSID//\\\\/\\\\}" key
+
+	if ! iwconfig "${iface}" mode "${mode}" ; then
+		eerror "Unable to change mode to ${mode}"
+		return 1
+	fi
+
+	if [[ ${ESSID} == "any" ]]; then
+		iwconfig "${iface}" ap any 2>/dev/null
+		dessid="any"
+		unset ESSIDVAR
+	else
+		ESSIDVAR="$( bash_variable "${ESSID}" )"
+		key="$( iwconfig_get_wep_key "${mac}" )"
+		if [[ ${wep_required} == "on" && ${key} == "off" ]]; then
+			eerror "WEP key is not set for \"${dessid}\" - not connecting"
+			return 1
+		fi
+		if [[ ${wep_required} == "off" && ${key} != "off" ]]; then
+			key="off"
+			ewarn "\"${dessid}\" is not WEP enabled - ignoring setting"
+		fi
+
+		if ! iwconfig "${iface}" key ${key} ; then
+			if [[ ${key} != "off" ]]; then
+				ewarn "${iface} does not support setting keys"
+				ewarn "or the parameter \"mac_key_${ESSIDVAR}\" or \"key_${ESSIDVAR}\" is incorrect"
+				return 1
+			fi
+		fi
+		[[ ${key} != "off" ]] && w="$( iwconfig_get_wep_status "${iface}" )"
+	fi
+
+	if ! iwconfig "${iface}" essid "${ESSID}" ; then
+		if [[ ${ESSID} != "any" ]]; then
+			ewarn "${iface} does not support setting ESSID to \"${dessid}\""
+		fi
+	fi
+
+	# Finally apply the user Config
+	iwconfig_user_config "${iface}" "${ESSIDVAR}"
+
+	vebegin "Connecting to \"${dessid}\" in ${mode} mode ${w}"
+
+	if [[ ${ESSID} != "any" ]] && is_function preassociate ; then
+		veinfo "Running preassociate function"
+		eindent
+		( preassociate "${iface}" )
+		e="$?"
+		eoutdent
+		if [[ ${e} != 0 ]]; then
+			veend 1 "preassociate \"${dessid}\" on ${iface} failed"
+			return 1
+		fi
+	fi
+
+	if ! iwconfig_wait_for_association "${iface}" ; then
+		veend 1
+		return 1
+	fi
+	veend 0
+
+	if [[ ${ESSID} == "any" ]]; then
+		ESSID="$( iwconfig_get_essid "${iface}" )"
+		iwconfig_associate "${iface}"
+		return $?
+	fi
+
+	iwconfig_report "${iface}"
+
+	if is_function postassociate ; then
+		veinfo "Running postassociate function"
+		eindent
+		( postassociate "${iface}" )
+		eoutdent
+	fi
+
+	return 0
+}
+
+# bool iwconfig_scan(char *iface)
+#
+# Fills 3 arrays with information from a wireless scan
+iwconfig_scan() {
+	local iface="$1" mode x ifvar="$( bash_variable "$1" )"
+
+	# First, we may need to change mode to scan in
+	x="scan_mode_${ifvar}"
+	mode="$( echo "${!x}" | tr '[:upper:]' '[:lower:]' )"
+	if [[ -n ${mode} ]]; then
+		if ! iwconfig "${iface}" mode "${mode}" ; then
+			ewarn "${iface} does not support setting the mode to \"${mode}\""
+		fi
+	fi
+
+	# Next we set any private driver ioctls needed
+	x="iwpriv_scan_pre_${ifvar}"
+	if [[ -n ${!x} ]]; then
+		if ! eval iwpriv "${iface}" "${!x}" ; then
+			ewarn "${iface} does not support the following private ioctls" \
+			ewarn "  ${!x}"
+		fi
+	fi
+
+	# Set the essid to any. This is required for scanning
+	iwconfig "${iface}" essid any
+	
+	veinfo "Scanning for access points"
+
+	# Sleep if required
+	x="sleep_scan_${ifvar}"
+	[[ -z ${!x} || ${!x} -gt 0 ]] && sleep "${!x:-1}"
+
+	local error=true i=-1 line
+	local -a mac essid enc qual mode
+
+	while read line; do
+		error=false
+		case "${line}" in
+			*Address:*)
+				(( i++ ))
+				mac[i]="$( echo "${line#*: }" | tr '[:lower:]' '[:upper:]' )"
+				;;
+			*ESSID:*)
+				essid[i]="${line#*\"}"
+				essid[i]="${essid[i]%*\"}"
+				;;
+			*Mode:*)
+				mode[i]="$(echo "${line#*:}" | tr '[:upper:]' '[:lower:]' )"
+				[[ ${mode[i]} == "master" ]] && mode[i]="managed"
+				;;
+			*'Encryption key:'*)
+				enc[i]="${line#*:}"
+				;;
+			*Quality*)
+				qual[i]="${line#*:}"
+				qual[i]="${qual[i]%/*}"
+				qual[i]="${qual[i]//[![:digit:]]/}"
+				qual[i]="${qual[i]:-0}"
+				;;
+		esac
+	done < <( iwlist "${iface}" scan 2>/dev/null )
+
+	if ${error}; then
+		ewarn "${iface} does not support scanning"
+		x="adhoc_essid_${ifvar}"
+		[[ -n ${!x} ]] && return 0
+		if [[ -n ${preferred_aps} ]]; then
+			[[ ${associate_order} == "forcepreferred" \
+			|| ${associate_order} == "forcepreferredonly" ]] && return 0
+		fi
+		eerror "You either need to set a preferred_aps list in /etc/conf.d/wireless"
+		eerror "   preferred_aps=( \"ESSID1\" \"ESSID2\" )"
+		eerror "   and set associate_order_${iface}=\"forcepreferred\""
+		eerror "   or set associate_order_${iface}=\"forcepreferredonly\""
+		eerror "or hardcode the ESSID to \"any\" and let the driver find an Access Point"
+		eerror "   essid_${iface}=\"any\""
+		eerror "or configure defaulting to Ad-Hoc when Managed fails"
+		eerror "   adhoc_essid_${iface}=\"WLAN\""
+		eerror "or hardcode the ESSID against the interface (not recommended)"
+		eerror "   essid_${iface}=\"ESSID\""
+		return 1
+	fi
+
+	# We may need to unset the previous private driver ioctls
+	x="iwpriv_scan_post_${ifvar}"
+	if [[ -n ${!x} ]]; then
+		if ! eval iwpriv "${iface}" "${!x}" ; then
+			ewarn "${iface} does not support the following private ioctls" \
+			ewarn "  ${!x}"
+		fi
+	fi
+
+	# Change back mode if needed
+	x="mode_${ifvar}"
+	x="$( echo "${!x:-managed}" | tr '[:upper:]' '[:lower:]' )"
+	[[ ${mode} != "${x}" ]] && iwconfig "${iface}" mode "${x}"
+
+	# Strip any duplicates
+	local i j x="${#mac[@]}" y
+	for (( i=0; i<x-1; i++ )) ; do
+		[[ -z ${mac[i]} ]] && continue
+		for (( j=i+1; j<x; j++)) ; do
+			if [[ ${mac[i]} == "${mac[j]}" ]] ; then
+				if [[ ${qual[i]} -gt ${qual[j]} ]] ; then
+					y="${j}"
+				else
+					y="${j}"
+				fi
+				unset mac[y]
+				unset qual[y]
+				unset essid[y]
+				unset mode[y]
+				unset enc[y]
+			fi
+		done
+	done
+	mac=( "${mac[@]}" )
+	qual=( "${qual[@]}" )
+	essid=( "${essid[@]}" )
+	mode=( "${mode[@]}" )
+	enc=( "${enc[@]}" )
+
+	for (( i=0; i<${#mac[@]}; i++ )); do
+		# Don't like ad-hoc nodes by default
+		[[ ${mode[i]} == "ad-hoc" ]] && (( qual[i]-=10000 ))
+		sortline="${sortline}${qual[i]} ${i}\n"
+	done
+
+	sortline=( $( echo -e "${sortline}" | sort -nr ) )
+
+	for (( i=0; i<${#mac[@]}; i++ )); do
+		(( x=(i * 2) + 1 ))
+		mac_APs[i]="${mac[${sortline[x]}]}"
+		essid_APs[i]="${essid[${sortline[x]}]}"
+		mode_APs[i]="${mode[${sortline[x]}]}"
+		enc_APs[i]="${enc[${sortline[x]}]}"
+	done
+
+	return 0
+}
+
+# void iwconfig_scan_report(void)
+#
+# Report the results of the scan and re-map any ESSIDs if they
+# have been configured for the MAC address found
+iwconfig_scan_report() {
+	local i k m remove
+	local -a u
+
+	[[ -z ${mac_APs} ]] && ewarn "  no access points found"
+
+	# We need to do the for loop like this so we can
+	# dynamically remove from the array
+	eindent
+	for ((i=0; i<${#mac_APs[@]}; i++)); do
+		k="(${mode_APs[i]}"
+		[[ ${enc_APs[i]} != "off" ]] && k="${k}, encrypted"
+		k="${k})"
+
+		if [[ -z ${essid_APs[i]} ]]; then
+			veinfo "Found ${mac_APs[i]} ${k}"
+		else
+			veinfo "Found \"${essid_APs[i]//\\\\/\\\\}\" at ${mac_APs[i]} ${k}"
+		fi
+
+		eindent
+
+		m="mac_essid_${mac_APs[i]//:/}"
+		if [[ -n ${!m} ]]; then
+			essid_APs[i]="${!m}"
+			veinfo "mapping to \"${!m//\\\\/\\\\}\""
+		fi
+
+		remove=false
+		# If we don't know the essid then we cannot connect to them
+		# so we remove them from our array
+		if [[ -z ${essid_APs[i]} ]]; then
+			remove=true
+		else
+			for k in "${blacklist_aps[@]}"; do
+				if [[ ${k} == "${essid_APs[i]}" ]]; then
+					vewarn "\"${k//\\\\/\\\\}\" has been blacklisted - not connecting"
+					remove=true
+					break
+				fi
+			done
+		fi
+
+		eoutdent
+
+		${remove} && u=( "${u[@]}" "${i}" )
+	done
+
+	eoutdent
+
+	# Now we remove any duplicates
+	for ((i=0; i < ${#essid_APs[@]} - 1; i++)); do
+		for ((j=${i} + 1; j <${#essid_APs[@]}; j++)); do
+			[[ ${essid_APs[i]} == "${essid_APs[j]}" ]] && u=( "${u[@]}" "${j}" )
+		done
+	done
+
+	for i in ${u[@]}; do
+		unset essid_APs[i]
+		unset mode_APs[i]
+		unset mac_APs[i]
+		unset enc_APs[i]
+	done
+
+	# We need to squash our arrays so indexes work again
+	essid_APs=( "${essid_APs[@]}" )
+	mode_APs=( "${mode_APs[@]}" )
+	mac_APs=( "${mac_APs[@]}" )
+	enc_APs=( "${enc_APs[@]}" )
+}
+
+# bool iwconfig_force_preferred(char *iface)
+#
+# Forces the preferred_aps list to associate in order
+# but only if they were not picked up by our scan
+iwconfig_force_preferred() {
+	local iface=$1 essid i
+
+	[[ -z ${preferred_aps} ]] && return 1
+
+	ewarn "Trying to force preferred in case they are hidden"
+	for essid in "${preferred_aps[@]}"; do
+		local found_AP=false
+		for ((i = 0; i < ${#mac_APs[@]}; i++)); do
+			if [[ ${essid} == "${essid_APs[i]}" ]]; then
+				found_AP=true
+				break
+			fi
+		done
+		if ! ${found_AP} ; then
+			ESSID="${essid}"
+			iwconfig_associate "${iface}" && return 0
+		fi
+	done
+
+	ewarn "Failed to associate with any preferred access points on ${iface}"
+	return 1
+}
+
+# bool iwconfig_connect_preferred(char *iface)
+#
+# Connects to preferred_aps in order if they were picked up
+# by our scan
+iwconfig_connect_preferred() {
+	local iface="$1" essid i
+
+	for essid in "${preferred_aps[@]}"; do
+		for ((i=0; i<${#essid_APs[@]}; i++)); do
+			if [[ ${essid} == "${essid_APs[i]}" ]]; then
+				ESSID="${essid}"
+				iwconfig_associate "${iface}" "${mode_APs[i]}" "${mac_APs[i]}" \
+					"${enc_APs[i]}" && return 0
+				break
+			fi
+		done
+	done
+
+	return 1
+}
+
+# bool iwconfig_connect_not_preferred(char *iface)
+#
+# Connects to any AP's found that are not in
+# our preferred list
+iwconfig_connect_not_preferred() {
+	local iface=$1 i ap has_preferred
+
+	for ((i=0; i<${#mac_APs[@]}; i++)); do
+		has_preferred=false
+		for ap in "${preferred_aps[@]}"; do
+			if [[ ${ap} == "${essid_APs[i]}" ]]; then
+				has_preferred=true
+				break
+			fi
+		done
+		if ! ${has_preferred} ; then
+			ESSID="${essid_APs[i]}"
+			iwconfig_associate "${iface}" "${mode_APs[i]}" "${mac_APs[i]}" \
+				"${enc_APs[i]}" && return 0
+		fi
+	done
+
+	return 1
+}
+
+# void iwconfig_defaults(char *iface)
+#
+# Apply some sane defaults to the wireless interface
+# incase the user already applied some changes
+iwconfig_defaults() {
+	local iface="$1"
+
+	# Set some defaults
+	iwconfig "${iface}" rate auto 2>/dev/null
+	iwconfig "${iface}" rts auto 2>/dev/null
+	iwconfig "${iface}" frag auto 2>/dev/null
+	iwconfig "${iface}" txpower auto 2>/dev/null
+
+}
+
+# void iwconfig_strip_associated(char *iface)
+#
+# We check to see which ifaces have associated AP's except for the iface
+# given and remove those AP's from the scan list
+# We also remove from the preferred list
+iwconfig_strip_associated() {
+	local iface="$1" e a j
+	local essid="$( iwconfig_get_essid "${iface}" )"
+	local -a ifaces=( $( iwconfig 2>/dev/null | grep -o "^\w*" ) )
+
+	for i in "${ifaces[@]}"; do
+		[[ ${i} == ${iface} ]] && continue
+		interface_is_up "${i}" || continue
+		iwconfig_test_associated "${i}" || continue
+		e="$( iwconfig_get_essid "${i}" )"
+		local -a u=()
+		for ((j=0; j<${#mac_APs[@]}; j++)); do
+			if [[ ${essid_APs[j]} == "${e}" ]]; then
+				ewarn "${e} has already been associated with ${i}"
+				unset essid_APs[j]
+				unset mode_Aps[j]
+				unset mac_APs[j]
+				unset enc_APs[j]
+				# We need to squash our arrays so that indexes work
+				essid_APs=( "${essid_APs[@]}" )
+				mode_APs=( "${mode_APs[@]}" )
+				mac_APs=( "${mac_APs[@]}" )
+				enc_APs=( "${enc_APs[@]}" )
+				break
+			fi
+		done
+		for ((j=0; j<${#preferred_aps[@]}; j++)); do
+			if [[ ${preferred_aps[j]} == "${e}" ]]; then
+				unset preferred_aps[j]
+				preferred_aps=( "${preferred_aps[@]}" )
+				break
+			fi
+		done
+	done
+}
+
+# bool iwconfig_configure(char *iface)
+#
+# The main startup code
+# First we bring the interface up, apply defaults, apply user configuration
+# Then we test to see if ad-hoc mode has been requested and branch if needed
+# Then we scan for access points and try to connect to them in a predetermined order
+# Once we're connected we show a report and then configure any interface
+# variables for the ESSID
+iwconfig_configure() {
+	local iface="$1" test x e ifvar="$( bash_variable "$1" )"
+	local -a essid_APs mac_APs mode_APs enc_APs
+
+	iwconfig_defaults "${iface}"
+	iwconfig_user_config "${iface}"
+
+	ESSID="essid_${ifvar}"
+	ESSID="${!ESSID}"
+
+	# Setup ad-hoc mode?
+	x="mode_${ifvar}"
+	x="$( echo "${!x:-managed}" | tr '[:upper:]' '[:lower:]' )"
+	if [[ ${x} == "ad-hoc" || ${x} == "master" ]]; then
+		iwconfig_setup_specific "${iface}" "${x}"
+		return $?
+	fi
+
+	if [[ ${x} != "managed" && ${x} != "auto" ]]; then
+		eerror "Only managed, ad-hoc, master and auto modes are supported"
+		return 1
+	fi
+
+	# We only change the mode if it's not the same as some drivers
+	# only do managed and throw an error changing to managed
+	local cur_mode="$( iwconfig_get_mode "${iface}" )"
+	if [[ ${cur_mode} != "${x}" ]]; then
+		if ! iwconfig "${iface}" mode "${x}" ; then
+			eerror "${iface} does not support setting the mode to \"${x}\""
+			return 1
+		fi
+	fi
+
+	# These arrays hold the results of our scan
+	local -a mac_APs essid_APs enc_APs
+
+	# Has an ESSID been forced?
+	if [[ -n ${ESSID} ]]; then
+		iwconfig_associate "${iface}" && return 0
+		[[ ${ESSID} == "any" ]] && iwconfig_force_preferred "${iface}" && return 0
+
+		ESSID="adhoc_essid_${ifvar}"
+		ESSID="${!ESSID}"
+		if [[ -n ${ESSID} ]]; then
+			iwconfig_setup_specific "${iface}" ad-hoc
+			return $?
+		fi
+		return 1
+	fi
+
+	# Do we have a preferred Access Point list specific to the interface?
+	x="preferred_aps_${ifvar}[@]"
+	[[ -n ${!x} ]] && preferred_aps=( "${!x}" )
+
+	# Do we have a blacklist Access Point list specific to the interface?
+	x="blacklist_aps_${ifvar}[@]"
+	[[ -n ${!x} ]] && blacklist_aps=( "${!x}" )
+
+	# Are we forcing preferred only?
+	x="associate_order_${ifvar}"
+	[[ -n ${!x} ]] && associate_order="${!x}"
+	associate_order="$(
+		echo "${associate_order:-any}" \
+		| tr '[:upper:]' '[:lower:]'
+	)"
+
+	if [[ ${associate_order} == "forcepreferredonly" ]]; then
+		iwconfig_force_preferred "${iface}" && return 0
+	else
+		iwconfig_scan "${iface}" || return 1
+		iwconfig_scan_report
+
+		# Strip AP's from the list that have already been associated with
+		# other wireless cards in the system if requested
+		x="unique_ap_${ifvar}"
+		[[ -n ${!x} ]] && unique_ap="${!x}"
+		unique_ap="$( echo "${unique_ap:-no}" | tr '[:upper:]' '[:lower:]' )"
+		[[ ${unique_ap} != "no" ]] && iwconfig_strip_associated "${iface}"
+
+		iwconfig_connect_preferred "${iface}" && return 0
+		[[ ${associate_order} == "forcepreferred" \
+			|| ${associate_order} == "forceany" ]] \
+			&& iwconfig_force_preferred "${iface}" && return 0
+		[[ ${associate_order} == "any" || ${associate_order} == "forceany" ]] \
+			&& iwconfig_connect_not_preferred "${iface}" && return 0
+	fi
+
+	e="associate with"
+	[[ -z ${mac_APs} ]] && e="find"
+	[[ ${preferred_only} == "force" || ${preferred_aps} == "forceonly" ]] \
+		&& e="force"
+	e="Couldn't ${e} any access points on ${iface}"
+
+	ESSID="adhoc_essid_${ifvar}"
+	ESSID="${!ESSID}"
+	if [[ -n ${ESSID} ]]; then
+		ewarn "${e}"
+		iwconfig_setup_specific "${iface}" ad-hoc
+		return $?
+	fi
+
+	eerror "${e}"
+	return 1
+}
+
+# bool iwconfig_pre_start(char *iface)
+#
+# Start entry point
+# First we check if wireless extensions exist on the interface
+# If they are then we configue wireless
+iwconfig_pre_start() {
+	local iface="$1" r=0
+
+	# We don't configure wireless if we're being called from
+	# the background
+	${IN_BACKGROUND} && return 0
+
+	save_options "ESSID" ""
+	interface_exists "${iface}" || return 0
+
+	# We need to bring the interface up, as some cards do not register
+	# in /proc/wireless until they are brought up.
+	interface_up "${iface}"
+
+	if ! iwconfig_exists "${iface}" ; then
+		veinfo "Wireless extensions not found for ${iface}"
+		return 0
+	fi
+
+	# Check for rf_kill - only ipw supports this at present, but other
+	# cards may in the future.
+	if [[ -e "/sys/class/net/${iface}/device/rf_kill" ]]; then
+		if [[ $( < "/sys/class/net/${iface}/device/rf_kill" ) != 0 ]]; then
+			eerror "Wireless radio has been killed for interface ${iface}"
+			return 1
+		fi
+	fi
+
+	einfo "Configuring wireless network for ${iface}"
+
+	# Are we a proper IEEE device?
+	# Most devices reutrn IEEE 802.11b/g - but intel cards return IEEE in lower case
+	# and RA cards return RAPCI or similar which really sucks :(
+	# For the time being, we will test prism54 not loading firmware which reports
+	# NOT READY!
+	x="$( iwconfig_get_type "${iface}" )"
+	if [[ ${x} == "NOT READY!" ]]; then
+		eerror "Looks like there was a probem loading the firmware for ${iface}"
+		return 1
+	fi
+
+	# Setup IFS incase parent script has modified it
+	local IFS=$' '$'\n'$'\t'
+
+	if iwconfig_configure "${iface}" ; then
+		save_options "ESSID" "${ESSID}"
+		return 0
+	fi
+
+	eerror "Failed to configure wireless for ${iface}"
+	iwconfig_defaults "${iface}"
+	unset ESSID ESSIDVAR
+	interface_down "${iface}"
+	return 1
+}
+
+iwconfig_post_stop() {
+	interface_exists "${iface}" || return 0
+	iwconfig_defaults "${iface}" 
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/macchanger b/net-scripts/net.modules.d/macchanger
deleted file mode 100644
index 76720b6..0000000
--- a/net-scripts/net.modules.d/macchanger
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void macchanger_depend(void)
-#
-# Sets up the dependancies for the module
-macchanger_depend() {
-	before macnet
-	functions interface_get_mac_address interface_set_mac_address
-}
-
-# void macchanger_expose(void)
-#
-# Expose variables that can be configured
-macchanger_expose() {
-	variables mac
-}
-
-# bool macchanger_pre_start(char *iface)
-#
-# Configures the MAC address for iface 
-macchanger_pre_start() {
-	# We don't change MAC addresses from background
-	${IN_BACKGROUND} && return 0
-
-	local iface="$1" mac opts ifvar="$(bash_variable "$1")"
-
-	mac="mac_${ifvar}"
-	[[ -z ${!mac} ]] && return 0
-
-	interface_exists "${iface}" true || return 1
-
-	ebegin "Changing MAC address of ${iface}"
-
-	# The interface needs to be up for macchanger to work most of the time
-	interface_down "${iface}"
-	
-	mac="$(echo "${!mac}" | tr '[:upper:]' '[:lower:]')"
-	case "${mac}" in
-		# specific mac-addr, i wish there were a shorter way to specify this 
-		[0-9a-f][0-9a-f]:[0-9a-f][0-9a-f]:[0-9a-f][0-9a-f]:[0-9a-f][0-9a-f]:[0-9a-f][0-9a-f]:[0-9a-f][0-9a-f])
-			# We don't need macchanger to change to a specific mac address
-			interface_set_mac_address "${iface}" "${mac}"
-			eend "$?"
-			if [[ $? == "0" ]] ; then
-				mac="$(interface_get_mac_address "${iface}")"
-				eindent
-				einfo "changed to ${mac}"
-				eoutdent
-				return 0
-			fi
-			;;
-
-		# increment MAC address, default macchanger behavior
-		increment) opts="${opts}" ;;
-
-		# randomize just the ending bytes
-		random-ending) opts="${opts} -e" ;;
-
-		# keep the same kind of physical layer (eg fibre, copper)
-		random-samekind) opts="${opts} -a" ;;
-
-		# randomize to any known vendor of any physical layer type
-		random-anykind) opts="${opts} -A" ;;
-
-		# fully random bytes
-		random-full) opts="${opts} -r" ;;
-
-		# default case is just to pass on all the options
-		*) opts="${opts} ${mac}" ;;
-	esac
-
-	if [[ ! -x /sbin/macchanger ]] ; then
-		eerror "For changing MAC addresses, emerge net-analyzer/macchanger"
-		return 1
-	fi
-
-	mac="$( /sbin/macchanger ${opts} "${iface}" \
-		| sed -n -e 's/^Faked MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' )"
-
-	# Sometimes the interface needs to be up ....
-	if [[ -z ${mac} ]] ; then
-		interface_up "${iface}"
-		mac="$( /sbin/macchanger ${opts} "${iface}" \
-			| sed -n -e 's/^Faked MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' )"
-	fi
-
-	if [[ -z ${mac} ]] ; then
-		eend 1 "Failed to set MAC address"
-		return 1
-	fi
-
-	eend 0
-	eindent
-	einfo "changed to ${mac}"
-	eoutdent
-
-	return 0 #important
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/macchanger.sh b/net-scripts/net.modules.d/macchanger.sh
new file mode 100644
index 0000000..76720b6
--- /dev/null
+++ b/net-scripts/net.modules.d/macchanger.sh
@@ -0,0 +1,102 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void macchanger_depend(void)
+#
+# Sets up the dependancies for the module
+macchanger_depend() {
+	before macnet
+	functions interface_get_mac_address interface_set_mac_address
+}
+
+# void macchanger_expose(void)
+#
+# Expose variables that can be configured
+macchanger_expose() {
+	variables mac
+}
+
+# bool macchanger_pre_start(char *iface)
+#
+# Configures the MAC address for iface 
+macchanger_pre_start() {
+	# We don't change MAC addresses from background
+	${IN_BACKGROUND} && return 0
+
+	local iface="$1" mac opts ifvar="$(bash_variable "$1")"
+
+	mac="mac_${ifvar}"
+	[[ -z ${!mac} ]] && return 0
+
+	interface_exists "${iface}" true || return 1
+
+	ebegin "Changing MAC address of ${iface}"
+
+	# The interface needs to be up for macchanger to work most of the time
+	interface_down "${iface}"
+	
+	mac="$(echo "${!mac}" | tr '[:upper:]' '[:lower:]')"
+	case "${mac}" in
+		# specific mac-addr, i wish there were a shorter way to specify this 
+		[0-9a-f][0-9a-f]:[0-9a-f][0-9a-f]:[0-9a-f][0-9a-f]:[0-9a-f][0-9a-f]:[0-9a-f][0-9a-f]:[0-9a-f][0-9a-f])
+			# We don't need macchanger to change to a specific mac address
+			interface_set_mac_address "${iface}" "${mac}"
+			eend "$?"
+			if [[ $? == "0" ]] ; then
+				mac="$(interface_get_mac_address "${iface}")"
+				eindent
+				einfo "changed to ${mac}"
+				eoutdent
+				return 0
+			fi
+			;;
+
+		# increment MAC address, default macchanger behavior
+		increment) opts="${opts}" ;;
+
+		# randomize just the ending bytes
+		random-ending) opts="${opts} -e" ;;
+
+		# keep the same kind of physical layer (eg fibre, copper)
+		random-samekind) opts="${opts} -a" ;;
+
+		# randomize to any known vendor of any physical layer type
+		random-anykind) opts="${opts} -A" ;;
+
+		# fully random bytes
+		random-full) opts="${opts} -r" ;;
+
+		# default case is just to pass on all the options
+		*) opts="${opts} ${mac}" ;;
+	esac
+
+	if [[ ! -x /sbin/macchanger ]] ; then
+		eerror "For changing MAC addresses, emerge net-analyzer/macchanger"
+		return 1
+	fi
+
+	mac="$( /sbin/macchanger ${opts} "${iface}" \
+		| sed -n -e 's/^Faked MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' )"
+
+	# Sometimes the interface needs to be up ....
+	if [[ -z ${mac} ]] ; then
+		interface_up "${iface}"
+		mac="$( /sbin/macchanger ${opts} "${iface}" \
+			| sed -n -e 's/^Faked MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' )"
+	fi
+
+	if [[ -z ${mac} ]] ; then
+		eend 1 "Failed to set MAC address"
+		return 1
+	fi
+
+	eend 0
+	eindent
+	einfo "changed to ${mac}"
+	eoutdent
+
+	return 0 #important
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/macnet b/net-scripts/net.modules.d/macnet
deleted file mode 100644
index 6be0a4b..0000000
--- a/net-scripts/net.modules.d/macnet
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (c) 2005-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-# Many thanks to all the people in the Gentoo forums for their ideas and
-# motivation for me to make this and keep on improving it
-
-# void macnet_depend(void)
-#
-# Sets up the dependancies for the module
-macnet_depend() {
-	before rename interface wireless
-	after macchanger
-	installed macchanger
-	functions interface_get_mac_address
-}
-
-# bool macnet_start(char *iface)
-#
-# All interfaces and module scripts can depend on the variables function 
-# which returns a space seperated list of user configuration variables
-# We can override each variable here from a given MAC address of the interface
-# Always returns 0
-macnet_pre_start() {
-	local iface="$1"
-
-	interface_exists "${iface}" || return 0
-
-	# We need to bring the interface up for some interfaces, otherwise the MAC
-	# address isn't consistent - mainly wireless cards with firmware uploading.
-	interface_up "${iface}"
-
-	local mac="$(interface_get_mac_address "${iface}")"
-	[[ -z ${mac} ]] && return 0
-
-	vebegin "Configuring ${iface} for MAC address ${mac}" 2>/dev/null
-	mac="${mac//:/}"
-	configure_variables "${iface}" "${mac}"
-	veend 0 2>/dev/null
-
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/macnet.sh b/net-scripts/net.modules.d/macnet.sh
new file mode 100644
index 0000000..6be0a4b
--- /dev/null
+++ b/net-scripts/net.modules.d/macnet.sh
@@ -0,0 +1,43 @@
+# Copyright (c) 2005-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+# Many thanks to all the people in the Gentoo forums for their ideas and
+# motivation for me to make this and keep on improving it
+
+# void macnet_depend(void)
+#
+# Sets up the dependancies for the module
+macnet_depend() {
+	before rename interface wireless
+	after macchanger
+	installed macchanger
+	functions interface_get_mac_address
+}
+
+# bool macnet_start(char *iface)
+#
+# All interfaces and module scripts can depend on the variables function 
+# which returns a space seperated list of user configuration variables
+# We can override each variable here from a given MAC address of the interface
+# Always returns 0
+macnet_pre_start() {
+	local iface="$1"
+
+	interface_exists "${iface}" || return 0
+
+	# We need to bring the interface up for some interfaces, otherwise the MAC
+	# address isn't consistent - mainly wireless cards with firmware uploading.
+	interface_up "${iface}"
+
+	local mac="$(interface_get_mac_address "${iface}")"
+	[[ -z ${mac} ]] && return 0
+
+	vebegin "Configuring ${iface} for MAC address ${mac}" 2>/dev/null
+	mac="${mac//:/}"
+	configure_variables "${iface}" "${mac}"
+	veend 0 2>/dev/null
+
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/netplugd b/net-scripts/net.modules.d/netplugd
deleted file mode 100644
index cd8ebe2..0000000
--- a/net-scripts/net.modules.d/netplugd
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright (c) 2005-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void netplugd_depend(void)
-#
-# Sets up the dependancies for the module
-netplugd_depend() {
-	after macnet rename
-	before interface
-	provide plug
-	functions interface_exists interface_get_mac_address
-}
-
-# void netplugd_expose(void)
-#
-# Expose variables that can be configured
-netplugd_expose() {
-	variables plug_timeout
-}
-
-# bool netplugd_check_installed(void)
-#
-# Returns 0 if netplug is installed, otherwise 1
-netplugd_check_installed() {
-	if [[ ! -x /sbin/netplugd ]]; then
-		${1:-false} && eerror "For netplug support, emerge sys-apps/netplug"
-		return 1
-	fi
-	return 0
-}
-
-# bool netplugd_pre_start(char *interface)
-#
-# Start netplug on an interface
-netplugd_pre_start() {
-	local iface="$1" timeout
-	local pidfile="/var/run/netplugd.${iface}.pid"
-
-	# We don't start netplug if we're being called from the background
-	${IN_BACKGROUND} && return 0
-
-	interface_exists "${iface}" || return 0
-
-	# We need a valid MAC address
-	# It's a basic test to ensure it's not a virtual interface
-	local mac="$(interface_get_mac_address "${iface}")"
-	if [[ -z ${mac} ]] ; then
-		vewarn "netplug only works on interfaces with a valid MAC address"
-		return 0
-	fi
-
-	# We don't work on bonded, bridges, tun/tap, vlan or wireless
-	for f in bonding bridge tuntap vlan wireless ; do
-		if is_function "${f}_exists" ; then
-			if ${f}_exists "${iface}" ; then
-				veinfo "netplug does not work with ${f}"
-				return 0
-			fi
-		fi
-	done
-
-	ebegin "Starting netplug on ${iface}"
-
-	# We need the interface up for netplug to listen to netlink events
-	interface_up "${iface}"
-
-	# Mark the us as inactive so netplug can restart us
-	mark_service_inactive "net.${iface}"
-
-	# Start netplug
-	start-stop-daemon --start --exec /sbin/netplugd \
-		--pidfile "${pidfile}" \
-		-- -i "${iface}" -P -p "${pidfile}" -c /dev/null
-	eend "$?" || return 1
-
-	eindent
-
-	timeout="plug_timeout_${ifvar}"
-	timeout="${!timeout:--1}"
-	if [[ ${timeout} == "0" ]] ; then
-		ewarn "WARNING: infinite timeout set for ${iface} to come up"
-	elif [[ ${timeout} -lt 0 ]] ; then
-		einfo "Backgrounding ..."
-		exit 0
-	fi
-
-	veinfo "Waiting for ${iface} to be marked as started"
-
-	local i=0
-	while true ; do
-		if service_started "net.${iface}" ; then
-			local addr="$( interface_get_address "${iface}" )"
-			einfo "${iface} configured with address ${addr}"
-			exit 0
-		fi
-		sleep 1
-		[[ ${timeout} == "0" ]] && continue
-		(( i++ ))
-		[[ ${i} == "${timeout}" || ${i} -gt "${timeout}" ]] && break
-	done
-
-	eend 1 "Failed to configure ${iface} in the background"
-	exit 0
-}
-
-# bool netplugd_stop(char *iface)
-#
-# Stops netplug on an interface
-# Returns 0 (true) when successful, non-zero otherwise
-netplugd_stop() {
-	${IN_BACKGROUND} && return 0
-	local iface="$1"
-	local pidfile="/var/run/netplugd.${iface}.pid"
-
-	[[ ! -e ${pidfile} ]] && return 0
-	
-	ebegin "Stopping netplug on ${iface}"
-	start-stop-daemon --stop --exec /sbin/netplugd \
-		--pidfile "${pidfile}"
-	eend $?
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/netplugd.sh b/net-scripts/net.modules.d/netplugd.sh
new file mode 100644
index 0000000..cd8ebe2
--- /dev/null
+++ b/net-scripts/net.modules.d/netplugd.sh
@@ -0,0 +1,124 @@
+# Copyright (c) 2005-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void netplugd_depend(void)
+#
+# Sets up the dependancies for the module
+netplugd_depend() {
+	after macnet rename
+	before interface
+	provide plug
+	functions interface_exists interface_get_mac_address
+}
+
+# void netplugd_expose(void)
+#
+# Expose variables that can be configured
+netplugd_expose() {
+	variables plug_timeout
+}
+
+# bool netplugd_check_installed(void)
+#
+# Returns 0 if netplug is installed, otherwise 1
+netplugd_check_installed() {
+	if [[ ! -x /sbin/netplugd ]]; then
+		${1:-false} && eerror "For netplug support, emerge sys-apps/netplug"
+		return 1
+	fi
+	return 0
+}
+
+# bool netplugd_pre_start(char *interface)
+#
+# Start netplug on an interface
+netplugd_pre_start() {
+	local iface="$1" timeout
+	local pidfile="/var/run/netplugd.${iface}.pid"
+
+	# We don't start netplug if we're being called from the background
+	${IN_BACKGROUND} && return 0
+
+	interface_exists "${iface}" || return 0
+
+	# We need a valid MAC address
+	# It's a basic test to ensure it's not a virtual interface
+	local mac="$(interface_get_mac_address "${iface}")"
+	if [[ -z ${mac} ]] ; then
+		vewarn "netplug only works on interfaces with a valid MAC address"
+		return 0
+	fi
+
+	# We don't work on bonded, bridges, tun/tap, vlan or wireless
+	for f in bonding bridge tuntap vlan wireless ; do
+		if is_function "${f}_exists" ; then
+			if ${f}_exists "${iface}" ; then
+				veinfo "netplug does not work with ${f}"
+				return 0
+			fi
+		fi
+	done
+
+	ebegin "Starting netplug on ${iface}"
+
+	# We need the interface up for netplug to listen to netlink events
+	interface_up "${iface}"
+
+	# Mark the us as inactive so netplug can restart us
+	mark_service_inactive "net.${iface}"
+
+	# Start netplug
+	start-stop-daemon --start --exec /sbin/netplugd \
+		--pidfile "${pidfile}" \
+		-- -i "${iface}" -P -p "${pidfile}" -c /dev/null
+	eend "$?" || return 1
+
+	eindent
+
+	timeout="plug_timeout_${ifvar}"
+	timeout="${!timeout:--1}"
+	if [[ ${timeout} == "0" ]] ; then
+		ewarn "WARNING: infinite timeout set for ${iface} to come up"
+	elif [[ ${timeout} -lt 0 ]] ; then
+		einfo "Backgrounding ..."
+		exit 0
+	fi
+
+	veinfo "Waiting for ${iface} to be marked as started"
+
+	local i=0
+	while true ; do
+		if service_started "net.${iface}" ; then
+			local addr="$( interface_get_address "${iface}" )"
+			einfo "${iface} configured with address ${addr}"
+			exit 0
+		fi
+		sleep 1
+		[[ ${timeout} == "0" ]] && continue
+		(( i++ ))
+		[[ ${i} == "${timeout}" || ${i} -gt "${timeout}" ]] && break
+	done
+
+	eend 1 "Failed to configure ${iface} in the background"
+	exit 0
+}
+
+# bool netplugd_stop(char *iface)
+#
+# Stops netplug on an interface
+# Returns 0 (true) when successful, non-zero otherwise
+netplugd_stop() {
+	${IN_BACKGROUND} && return 0
+	local iface="$1"
+	local pidfile="/var/run/netplugd.${iface}.pid"
+
+	[[ ! -e ${pidfile} ]] && return 0
+	
+	ebegin "Stopping netplug on ${iface}"
+	start-stop-daemon --stop --exec /sbin/netplugd \
+		--pidfile "${pidfile}"
+	eend $?
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/pppd b/net-scripts/net.modules.d/pppd
deleted file mode 100644
index 97caf6b..0000000
--- a/net-scripts/net.modules.d/pppd
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright (c) 2005-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# void pppd_depend(void)
-#
-# Sets up the dependancies for the module
-pppd_depend() {
-	after interface
-	before dhcp
-	provide ppp
-}
-
-# bool pppd_check_installed(void)
-#
-# Returns 1 if pppd is installed, otherwise 0
-pppd_check_installed() {
-	if [[ ! -x /usr/sbin/pppd ]] ; then
-		${1:-false} && eerror "For PPP support, emerge net-dialup/ppp"
-		return 1
-	fi
-	return 0
-}
-
-# char *pppd_regex_escape(char *string)
-#
-# Returns the supplied string with any special regex
-# characters escaped so they don't provide regex intructions
-# This may be a candidate for adding to /sbin/functions.sh or
-# net-scripts functions at some point
-pppd_regex_escape() {
-	local escaped_result="$*"
-	escaped_result="${escaped_result//\\/\\\\}"
-	escaped_result="${escaped_result//./\\.}"
-	escaped_result="${escaped_result//+/\\+}"
-	escaped_result="${escaped_result//(/\\(}"
-	escaped_result="${escaped_result//)/\\)}"
-	escaped_result="${escaped_result//[/\\[}"
-	escaped_result="${escaped_result//]/\\]}"
-	escaped_result="${escaped_result//\{/\\\{}"
-	escaped_result="${escaped_result//\}/\\\}}"
-	escaped_result="${escaped_result//\?/\\\?}"
-	escaped_result="${escaped_result//\*/\\\*}"
-	escaped_result="${escaped_result//\//\\/}" 
-	escaped_result="${escaped_result//|/\\|}"
-	escaped_result="${escaped_result//&/\\&}"
-	escaped_result="${escaped_result//~/\\~}"
-	escaped_result="${escaped_result//^/\\^}"
-	escaped_result="${escaped_result//$/\\$}"
-	echo "${escaped_result}"
-}
-
-# bool pppd_update_secrets_file(char* filepath, char* username, \
-#    char* remotename, char* password)
-#
-# Add/update PAP/CHAP authentication information 
-pppd_update_secrets_file() {
-	local filepath="$1" username="$2" remotename="$3" password="$4"
-	if [[ ! -s ${filepath} ]] ; then
-		echo '#'client$'\t'server$'\t'secret$'\t'IP addresses > "${filepath}" \
-			&& chmod 0600 "${filepath}" \
-			|| return 1
-	fi
-
-	#escape username and remotename, used in following sed calls
-	local regex_username="$(pppd_regex_escape "${username}")"
-	local regex_remotename="$(pppd_regex_escape "${remotename}")"
-	local regex_password
-	local regex_filter="[ \t]*\"?${regex_username}\"?[ \t]*\"?${regex_remotename}\"?[ \t]*"
-
-	#read old password, including " chars 
-	#for being able to distinct when we need to add or update auth info
-	local old_password="$(
-	sed -r -e "/^${regex_filter}\".*\"[ \t]*\$/\
-		{s/^${regex_filter}(\".*\")[ \t]*\$/\1/;q;};\
-		d;" \
-		"${filepath}"
-	)"
-
-	if [[ -z "${old_password}" ]] ; then
-		regex_username="${username//\\/\\\\}"
-		regex_remotename="${remotename//\\/\\\\}"
-		regex_password="${password//\\/\\\\}"
-		regex_password=${password//"/\\\\"}
-		sed -r -i -e "\$a\"${regex_username}\" ${regex_remotename} \"${regex_password}\"" ${filepath}
-		vewarn "Authentication info has been added to ${filepath}"
-	elif [[ "\"${password//\"/\\\"}\"" != "${old_password}" ]] ; then
-		regex_password="${password//\\/\\\\}"
-		regex_password="${regex_password//\//\\/}"
-		regex_password="${regex_password//&/\\&}"
-		regex_password=${regex_password//\"/\\\\\"}
-		sed -r -i -e "s/^(${regex_filter}\").*(\"[ \t]*)\$/\1${regex_password}\2/" ${filepath}
-		vewarn "Authentication info has been updated in ${filepath}"
-	fi
-	return 0
-}
-
-# bool pppd_start(char *iface)
-#
-# Start PPP on an interface by calling pppd
-#
-# Returns 0 (true) when successful, otherwise 1
-pppd_start() {
-	${IN_BACKGROUND} && return 0
-
-	local iface="$1" ifvar="$(bash_variable "$1")" opts="" link
-	if [[ ${iface%%[0-9]*} != "ppp" ]] ; then
-		eerror "PPP can only be invoked from net.ppp[0-9]"
-		return 1
-	fi
-
-	local unit="${iface#ppp}"
-	if [[ -z ${unit} ]] ; then
-		eerror "PPP requires a unit - use net.ppp[0-9] instead of net.ppp"
-		return 1
-	fi
-
-	# PPP requires a link to communicate over - normally a serial port
-	# PPPoE communicates over Ethernet
-	# PPPoA communicates over ATM
-	# In all cases, the link needs to be available before we start PPP
-	link="link_${ifvar}"
-	if [[ -z ${!link} ]] ; then
-		eerror "${link} has not been set in /etc/conf.d/net"
-		return 1
-	fi
-
-	# Might or might not be set in conf.d/net
-	local user password i
-	username="username_${ifvar}"
-	password="password_${ifvar}"
-
-	#Add/update info in PAP/CHAP secrets files
-	if [[ -n ${!username} && -n ${!password} ]] ; then
-		for i in chap pap ; do
-			if ! pppd_update_secrets_file "/etc/ppp/${i}-secrets" \
-					"${!username}" "${iface}" "${!password}" ; then
-				eerror "Failed to update /etc/ppp/${i}-secrets"
-				return 1
-			fi
-		done
-	fi
-
-	# Load any commandline options
-	opts="pppd_${ifvar}[@]"
-	opts="${!opts}"
-
-	# We don't work with these options set by the user
-	for i in unit nodetach linkname ; do
-		if [[ " ${opts} " == *" ${i} "* ]] ; then
-			eerror "The option \"${i}\" is not allowed in pppd_${ifvar}"
-			return 1
-		fi
-	done
-
-	# Check for mtu/mru
-	local mtu="mtu_${ifvar}"
-	if [[ -n ${!mtu} ]] ; then
-		[[ " ${opts} " != *" mtu "* ]] && opts="${opts} mtu ${!mtu}"
-		[[ " ${opts} " != *" mru "* ]] && opts="${opts} mru ${!mtu}"
-	fi
-
-	# Set linkname because we need /var/run/ppp-${linkname}.pid
-	# This pidfile has the advantage of being there, even if ${iface} interface was never started
-	opts="linkname ${iface} ${opts}"
-
-	# Setup auth info
-	[[ -n ${!username} ]] && opts="user '"${!username}"' ${opts}"
-	opts="remotename ${iface} ${opts}"
-
-	# Load a custom interface configuration file if it exists
-	[[ -f "/etc/ppp/options.${iface}" ]] \
-		&& opts="${opts} file /etc/ppp/options.${iface}"
-
-	# Set unit
-	opts="unit ${unit} ${opts}"
-
-	# Default maxfail to 0 unless specified
-	[[ " ${opts} " != *" maxfail "* ]] && opts="${opts} maxfail 0"
-
-	# Append persist
-	[[ " ${opts} " != *" persist "* ]] && opts="${opts} persist"
-	
-	# Setup connect script
-	local chat="chat_${ifvar}[@]"
-	if [[ -n "${!chat}" ]] ; then
-		local chatopts="/usr/sbin/chat -e -E -v"
-		local -a phone_number="phone_number_${ifvar}[@]"
-		phone_number=( "${!phone_number}" )
-		if [[ ${#phone_number[@]} -ge 1 ]] ; then
-			chatopts="${chatopts} -T '${phone_number[0]}'"
-			if [[ ${#phone_number[@]} -ge 2 ]] ; then
-				chatopts="${chatopts} -U '${phone_number[1]}'"
-			fi
-		fi
-		opts="${opts} connect $(requote "${chatopts} $(requote "${!chat}")")"
-	fi
-
-	# Add plugins
-	local plugins="plugins_${ifvar}[@]"
-	for i in "${!plugins}" ; do
-		local -a plugin=( ${i} )
-		# Bound to be some users who do this
-		[[ ${plugin[0]} == "pppoe" ]] && plugin[0]="rp-pppoe"
-		[[ ${plugin[0]} == "pppoa" ]] && plugin[0]="pppoatm"
-		[[ ${plugin[0]} == "capi" ]] && plugin[0]="capiplugin"
-
-		[[ ${plugin[0]} == "rp-pppoe" ]] && opts="${opts} connect true"
-		opts="${opts} plugin ${plugin[0]}.so ${plugin[@]:1}"
-		[[ ${plugin[0]} == "rp-pppoe" ]] && opts="${opts} ${!link}"
-	done
-
-	#Specialized stuff. Insert here actions particular to connection type (pppoe,pppoa,capi)
-	local insert_link_in_opts=1
-	if [[ " ${opts} " == *" plugin rp-pppoe.so "* ]] ; then
-		if [[ ! -e /proc/net/pppoe ]] ; then
-			# Load the PPPoE kernel module
-			if ! modprobe pppoe ; then
-				eerror "kernel does not support PPPoE"
-				return 1
-			fi
-		fi
-
-		# Ensure that the link exists and is up
-		interface_exists "${!link}" true || return 1
-		interface_up "${!link}"
-
-		insert_link_in_opts=0
-	fi
-
-	if [[ " ${opts} " == *" plugin pppoatm.so "* ]] ; then
-		if [[ ! -d /proc/net/atm ]] ; then
-			# Load the PPPoA kernel module
-			if ! modprobe pppoatm ; then
-				eerror "kernel does not support PPPoATM"
-				return 1
-			fi
-		fi
-	fi
-	[[ ${insert_link_in_opts} -eq 0 ]] || opts="${!link} ${opts}"
-
-	ebegin "Running pppd"
-	mark_service_inactive "net.${iface}"
-	eval start-stop-daemon --start --exec /usr/sbin/pppd \
-		--pidfile "/var/run/ppp-${iface}.pid" -- "${opts}" >/dev/null
-	if [[ $? != "0" ]] ; then
-		eend $? "Failed to start PPP"
-		mark_service_starting "net.${iface}"
-		return $?
-	fi
-
-	if [[ " ${opts} " == *" updetach "* ]] ; then
-		local addr="$(interface_get_address "${iface}")"
-		einfo "${iface} received address ${addr}"
-	else
-		einfo "Backgrounding ..."
-	fi
-
-	# pppd will re-call us when we bring the interface up
-	exit 0
-}
-
-# bool pppd_stop(char *iface)
-#
-# Stop PPP link by killing the associated pppd process
-#
-# Returns 0 (true) if no process to kill or it terminates successfully,
-# otherwise non-zero (false)
-pppd_stop() {
-	${IN_BACKGROUND} && return 0
-	local iface="$1" pidfile="/var/run/ppp-$1.pid"
-
-	[[ ! -s ${pidfile} ]] && return 0
-
-	einfo "Stopping pppd on ${iface}"
-	start-stop-daemon --stop --exec /usr/sbin/pppd --pidfile "${pidfile}"
-	eend $?
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/pppd.sh b/net-scripts/net.modules.d/pppd.sh
new file mode 100644
index 0000000..97caf6b
--- /dev/null
+++ b/net-scripts/net.modules.d/pppd.sh
@@ -0,0 +1,279 @@
+# Copyright (c) 2005-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# void pppd_depend(void)
+#
+# Sets up the dependancies for the module
+pppd_depend() {
+	after interface
+	before dhcp
+	provide ppp
+}
+
+# bool pppd_check_installed(void)
+#
+# Returns 1 if pppd is installed, otherwise 0
+pppd_check_installed() {
+	if [[ ! -x /usr/sbin/pppd ]] ; then
+		${1:-false} && eerror "For PPP support, emerge net-dialup/ppp"
+		return 1
+	fi
+	return 0
+}
+
+# char *pppd_regex_escape(char *string)
+#
+# Returns the supplied string with any special regex
+# characters escaped so they don't provide regex intructions
+# This may be a candidate for adding to /sbin/functions.sh or
+# net-scripts functions at some point
+pppd_regex_escape() {
+	local escaped_result="$*"
+	escaped_result="${escaped_result//\\/\\\\}"
+	escaped_result="${escaped_result//./\\.}"
+	escaped_result="${escaped_result//+/\\+}"
+	escaped_result="${escaped_result//(/\\(}"
+	escaped_result="${escaped_result//)/\\)}"
+	escaped_result="${escaped_result//[/\\[}"
+	escaped_result="${escaped_result//]/\\]}"
+	escaped_result="${escaped_result//\{/\\\{}"
+	escaped_result="${escaped_result//\}/\\\}}"
+	escaped_result="${escaped_result//\?/\\\?}"
+	escaped_result="${escaped_result//\*/\\\*}"
+	escaped_result="${escaped_result//\//\\/}" 
+	escaped_result="${escaped_result//|/\\|}"
+	escaped_result="${escaped_result//&/\\&}"
+	escaped_result="${escaped_result//~/\\~}"
+	escaped_result="${escaped_result//^/\\^}"
+	escaped_result="${escaped_result//$/\\$}"
+	echo "${escaped_result}"
+}
+
+# bool pppd_update_secrets_file(char* filepath, char* username, \
+#    char* remotename, char* password)
+#
+# Add/update PAP/CHAP authentication information 
+pppd_update_secrets_file() {
+	local filepath="$1" username="$2" remotename="$3" password="$4"
+	if [[ ! -s ${filepath} ]] ; then
+		echo '#'client$'\t'server$'\t'secret$'\t'IP addresses > "${filepath}" \
+			&& chmod 0600 "${filepath}" \
+			|| return 1
+	fi
+
+	#escape username and remotename, used in following sed calls
+	local regex_username="$(pppd_regex_escape "${username}")"
+	local regex_remotename="$(pppd_regex_escape "${remotename}")"
+	local regex_password
+	local regex_filter="[ \t]*\"?${regex_username}\"?[ \t]*\"?${regex_remotename}\"?[ \t]*"
+
+	#read old password, including " chars 
+	#for being able to distinct when we need to add or update auth info
+	local old_password="$(
+	sed -r -e "/^${regex_filter}\".*\"[ \t]*\$/\
+		{s/^${regex_filter}(\".*\")[ \t]*\$/\1/;q;};\
+		d;" \
+		"${filepath}"
+	)"
+
+	if [[ -z "${old_password}" ]] ; then
+		regex_username="${username//\\/\\\\}"
+		regex_remotename="${remotename//\\/\\\\}"
+		regex_password="${password//\\/\\\\}"
+		regex_password=${password//"/\\\\"}
+		sed -r -i -e "\$a\"${regex_username}\" ${regex_remotename} \"${regex_password}\"" ${filepath}
+		vewarn "Authentication info has been added to ${filepath}"
+	elif [[ "\"${password//\"/\\\"}\"" != "${old_password}" ]] ; then
+		regex_password="${password//\\/\\\\}"
+		regex_password="${regex_password//\//\\/}"
+		regex_password="${regex_password//&/\\&}"
+		regex_password=${regex_password//\"/\\\\\"}
+		sed -r -i -e "s/^(${regex_filter}\").*(\"[ \t]*)\$/\1${regex_password}\2/" ${filepath}
+		vewarn "Authentication info has been updated in ${filepath}"
+	fi
+	return 0
+}
+
+# bool pppd_start(char *iface)
+#
+# Start PPP on an interface by calling pppd
+#
+# Returns 0 (true) when successful, otherwise 1
+pppd_start() {
+	${IN_BACKGROUND} && return 0
+
+	local iface="$1" ifvar="$(bash_variable "$1")" opts="" link
+	if [[ ${iface%%[0-9]*} != "ppp" ]] ; then
+		eerror "PPP can only be invoked from net.ppp[0-9]"
+		return 1
+	fi
+
+	local unit="${iface#ppp}"
+	if [[ -z ${unit} ]] ; then
+		eerror "PPP requires a unit - use net.ppp[0-9] instead of net.ppp"
+		return 1
+	fi
+
+	# PPP requires a link to communicate over - normally a serial port
+	# PPPoE communicates over Ethernet
+	# PPPoA communicates over ATM
+	# In all cases, the link needs to be available before we start PPP
+	link="link_${ifvar}"
+	if [[ -z ${!link} ]] ; then
+		eerror "${link} has not been set in /etc/conf.d/net"
+		return 1
+	fi
+
+	# Might or might not be set in conf.d/net
+	local user password i
+	username="username_${ifvar}"
+	password="password_${ifvar}"
+
+	#Add/update info in PAP/CHAP secrets files
+	if [[ -n ${!username} && -n ${!password} ]] ; then
+		for i in chap pap ; do
+			if ! pppd_update_secrets_file "/etc/ppp/${i}-secrets" \
+					"${!username}" "${iface}" "${!password}" ; then
+				eerror "Failed to update /etc/ppp/${i}-secrets"
+				return 1
+			fi
+		done
+	fi
+
+	# Load any commandline options
+	opts="pppd_${ifvar}[@]"
+	opts="${!opts}"
+
+	# We don't work with these options set by the user
+	for i in unit nodetach linkname ; do
+		if [[ " ${opts} " == *" ${i} "* ]] ; then
+			eerror "The option \"${i}\" is not allowed in pppd_${ifvar}"
+			return 1
+		fi
+	done
+
+	# Check for mtu/mru
+	local mtu="mtu_${ifvar}"
+	if [[ -n ${!mtu} ]] ; then
+		[[ " ${opts} " != *" mtu "* ]] && opts="${opts} mtu ${!mtu}"
+		[[ " ${opts} " != *" mru "* ]] && opts="${opts} mru ${!mtu}"
+	fi
+
+	# Set linkname because we need /var/run/ppp-${linkname}.pid
+	# This pidfile has the advantage of being there, even if ${iface} interface was never started
+	opts="linkname ${iface} ${opts}"
+
+	# Setup auth info
+	[[ -n ${!username} ]] && opts="user '"${!username}"' ${opts}"
+	opts="remotename ${iface} ${opts}"
+
+	# Load a custom interface configuration file if it exists
+	[[ -f "/etc/ppp/options.${iface}" ]] \
+		&& opts="${opts} file /etc/ppp/options.${iface}"
+
+	# Set unit
+	opts="unit ${unit} ${opts}"
+
+	# Default maxfail to 0 unless specified
+	[[ " ${opts} " != *" maxfail "* ]] && opts="${opts} maxfail 0"
+
+	# Append persist
+	[[ " ${opts} " != *" persist "* ]] && opts="${opts} persist"
+	
+	# Setup connect script
+	local chat="chat_${ifvar}[@]"
+	if [[ -n "${!chat}" ]] ; then
+		local chatopts="/usr/sbin/chat -e -E -v"
+		local -a phone_number="phone_number_${ifvar}[@]"
+		phone_number=( "${!phone_number}" )
+		if [[ ${#phone_number[@]} -ge 1 ]] ; then
+			chatopts="${chatopts} -T '${phone_number[0]}'"
+			if [[ ${#phone_number[@]} -ge 2 ]] ; then
+				chatopts="${chatopts} -U '${phone_number[1]}'"
+			fi
+		fi
+		opts="${opts} connect $(requote "${chatopts} $(requote "${!chat}")")"
+	fi
+
+	# Add plugins
+	local plugins="plugins_${ifvar}[@]"
+	for i in "${!plugins}" ; do
+		local -a plugin=( ${i} )
+		# Bound to be some users who do this
+		[[ ${plugin[0]} == "pppoe" ]] && plugin[0]="rp-pppoe"
+		[[ ${plugin[0]} == "pppoa" ]] && plugin[0]="pppoatm"
+		[[ ${plugin[0]} == "capi" ]] && plugin[0]="capiplugin"
+
+		[[ ${plugin[0]} == "rp-pppoe" ]] && opts="${opts} connect true"
+		opts="${opts} plugin ${plugin[0]}.so ${plugin[@]:1}"
+		[[ ${plugin[0]} == "rp-pppoe" ]] && opts="${opts} ${!link}"
+	done
+
+	#Specialized stuff. Insert here actions particular to connection type (pppoe,pppoa,capi)
+	local insert_link_in_opts=1
+	if [[ " ${opts} " == *" plugin rp-pppoe.so "* ]] ; then
+		if [[ ! -e /proc/net/pppoe ]] ; then
+			# Load the PPPoE kernel module
+			if ! modprobe pppoe ; then
+				eerror "kernel does not support PPPoE"
+				return 1
+			fi
+		fi
+
+		# Ensure that the link exists and is up
+		interface_exists "${!link}" true || return 1
+		interface_up "${!link}"
+
+		insert_link_in_opts=0
+	fi
+
+	if [[ " ${opts} " == *" plugin pppoatm.so "* ]] ; then
+		if [[ ! -d /proc/net/atm ]] ; then
+			# Load the PPPoA kernel module
+			if ! modprobe pppoatm ; then
+				eerror "kernel does not support PPPoATM"
+				return 1
+			fi
+		fi
+	fi
+	[[ ${insert_link_in_opts} -eq 0 ]] || opts="${!link} ${opts}"
+
+	ebegin "Running pppd"
+	mark_service_inactive "net.${iface}"
+	eval start-stop-daemon --start --exec /usr/sbin/pppd \
+		--pidfile "/var/run/ppp-${iface}.pid" -- "${opts}" >/dev/null
+	if [[ $? != "0" ]] ; then
+		eend $? "Failed to start PPP"
+		mark_service_starting "net.${iface}"
+		return $?
+	fi
+
+	if [[ " ${opts} " == *" updetach "* ]] ; then
+		local addr="$(interface_get_address "${iface}")"
+		einfo "${iface} received address ${addr}"
+	else
+		einfo "Backgrounding ..."
+	fi
+
+	# pppd will re-call us when we bring the interface up
+	exit 0
+}
+
+# bool pppd_stop(char *iface)
+#
+# Stop PPP link by killing the associated pppd process
+#
+# Returns 0 (true) if no process to kill or it terminates successfully,
+# otherwise non-zero (false)
+pppd_stop() {
+	${IN_BACKGROUND} && return 0
+	local iface="$1" pidfile="/var/run/ppp-$1.pid"
+
+	[[ ! -s ${pidfile} ]] && return 0
+
+	einfo "Stopping pppd on ${iface}"
+	start-stop-daemon --stop --exec /usr/sbin/pppd --pidfile "${pidfile}"
+	eend $?
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/pump b/net-scripts/net.modules.d/pump
deleted file mode 100644
index a2dacfc..0000000
--- a/net-scripts/net.modules.d/pump
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Fix any potential localisation problems
-# Note that LC_ALL trumps LC_anything_else according to locale(7)
-pump() {
-	LC_ALL=C /sbin/pump "$@"
-}
-
-# void pump_depend(void)
-#
-# Sets up the dependancies for the module
-pump_depend() {
-	after interface
-	provide dhcp
-	functions interface_exists interface_get_address
-}
-
-# void pump_expose(void)
-#
-# Expose variables that can be configured
-pump_expose() {
-	variables pump dhcp
-}
-
-# bool pump_check_installed(void)
-#
-# Returns 1 if pump is installed, otherwise 0
-pump_check_installed() {
-	[[ -x /sbin/pump ]] && return 0
-	${1:-false} && eerror "For DHCP (pump) support, emerge net-misc/pump"
-	return 1
-}
-
-# bool pump_stop(char *iface)
-#
-# Stop pump on an interface
-# Return 0 if pump is not running or we stop it successfully
-# Otherwise 1
-pump_stop() {
-	local iface="$1" count e
-
-	# We check for a pump process first as querying for status
-	# causes pump to spawn a process
-	pidof /sbin/pump &>/dev/null || return 0
-
-	# Check that pump is running on the interface
-	pump --status --interface "${iface}" 2>/dev/null \
-		| grep -q "^Device ${iface}" || return 0
-
-	# Pump always releases the lease
-	ebegin "Stopping pump on ${iface}"
-	pump --release --interface "${iface}"
-	eend $? "Failed to stop pump"
-}
-
-# bool pump_start(char *iface)
-#
-# Start pump on an interface by calling pumpcd $iface $options
-#
-# Returns 0 (true) when a dhcp address is obtained, otherwise
-# the return value from pump
-pump_start() {
-	local iface="$1" opts d ifvar="$(bash_variable "$1")" search
-
-	interface_exists "${iface}" true || return 1
-
-	opts="pump_${ifvar}"
-	opts="${!opts}"
-
-	# Map some generic options to pump
-	d="dhcp_${ifvar}"
-	d=" ${!d} "
-	[[ ${d} == "  " ]] && d=" ${dhcp} "
-	[[ ${d} == *" nodns "* ]] && opts="${opts} --no-dns"
-	[[ ${d} == *" nogateway "* ]] && opts="${opts} --no-gateway"
-	[[ ${d} == *" nontp "* ]] && opts="${opts} --no-ntp"
-
-	search="dns_search_${ifvar}"
-	[[ -n ${!search} ]] && opts="${opts} --search-path='"${!search}"'"
-
-	# Add our route metric
-	metric="metric_${ifvar}"
-	[[ -n ${!metric} ]] && opts="${opts} --route-metric ${!metric}"
-
-	[[ ! -d "${statedir}/${iface}" ]] && mkdir -m 0755 -p "${statedir}/${iface}"
-
-	opts="${opts} --win-client-ident --etc-dir=${statedir}/${iface}"
-	opts="${opts} --script \"${svclib}/net.modules.d/helpers.d/pump-wrapper\""
-	opts="${opts} --keep-up --interface ${iface}"
-
-	# Bring up DHCP for this interface (or alias)
-	ebegin "Running pump"
-	eval pump "${opts}"
-	eend $? || return $?
-
-	# pump succeeded, show address retrieved
-	local addr="$(interface_get_address "${iface}")"
-	einfo "${iface} received address ${addr}"
-
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/pump.sh b/net-scripts/net.modules.d/pump.sh
new file mode 100644
index 0000000..a2dacfc
--- /dev/null
+++ b/net-scripts/net.modules.d/pump.sh
@@ -0,0 +1,105 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# Fix any potential localisation problems
+# Note that LC_ALL trumps LC_anything_else according to locale(7)
+pump() {
+	LC_ALL=C /sbin/pump "$@"
+}
+
+# void pump_depend(void)
+#
+# Sets up the dependancies for the module
+pump_depend() {
+	after interface
+	provide dhcp
+	functions interface_exists interface_get_address
+}
+
+# void pump_expose(void)
+#
+# Expose variables that can be configured
+pump_expose() {
+	variables pump dhcp
+}
+
+# bool pump_check_installed(void)
+#
+# Returns 1 if pump is installed, otherwise 0
+pump_check_installed() {
+	[[ -x /sbin/pump ]] && return 0
+	${1:-false} && eerror "For DHCP (pump) support, emerge net-misc/pump"
+	return 1
+}
+
+# bool pump_stop(char *iface)
+#
+# Stop pump on an interface
+# Return 0 if pump is not running or we stop it successfully
+# Otherwise 1
+pump_stop() {
+	local iface="$1" count e
+
+	# We check for a pump process first as querying for status
+	# causes pump to spawn a process
+	pidof /sbin/pump &>/dev/null || return 0
+
+	# Check that pump is running on the interface
+	pump --status --interface "${iface}" 2>/dev/null \
+		| grep -q "^Device ${iface}" || return 0
+
+	# Pump always releases the lease
+	ebegin "Stopping pump on ${iface}"
+	pump --release --interface "${iface}"
+	eend $? "Failed to stop pump"
+}
+
+# bool pump_start(char *iface)
+#
+# Start pump on an interface by calling pumpcd $iface $options
+#
+# Returns 0 (true) when a dhcp address is obtained, otherwise
+# the return value from pump
+pump_start() {
+	local iface="$1" opts d ifvar="$(bash_variable "$1")" search
+
+	interface_exists "${iface}" true || return 1
+
+	opts="pump_${ifvar}"
+	opts="${!opts}"
+
+	# Map some generic options to pump
+	d="dhcp_${ifvar}"
+	d=" ${!d} "
+	[[ ${d} == "  " ]] && d=" ${dhcp} "
+	[[ ${d} == *" nodns "* ]] && opts="${opts} --no-dns"
+	[[ ${d} == *" nogateway "* ]] && opts="${opts} --no-gateway"
+	[[ ${d} == *" nontp "* ]] && opts="${opts} --no-ntp"
+
+	search="dns_search_${ifvar}"
+	[[ -n ${!search} ]] && opts="${opts} --search-path='"${!search}"'"
+
+	# Add our route metric
+	metric="metric_${ifvar}"
+	[[ -n ${!metric} ]] && opts="${opts} --route-metric ${!metric}"
+
+	[[ ! -d "${statedir}/${iface}" ]] && mkdir -m 0755 -p "${statedir}/${iface}"
+
+	opts="${opts} --win-client-ident --etc-dir=${statedir}/${iface}"
+	opts="${opts} --script \"${svclib}/net.modules.d/helpers.d/pump-wrapper\""
+	opts="${opts} --keep-up --interface ${iface}"
+
+	# Bring up DHCP for this interface (or alias)
+	ebegin "Running pump"
+	eval pump "${opts}"
+	eend $? || return $?
+
+	# pump succeeded, show address retrieved
+	local addr="$(interface_get_address "${iface}")"
+	einfo "${iface} received address ${addr}"
+
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/rename b/net-scripts/net.modules.d/rename
deleted file mode 100644
index 43a6da1..0000000
--- a/net-scripts/net.modules.d/rename
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (c) 2005-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void rename_depend(void)
-#
-# Sets up the dependancies for the module
-rename_depend() {
-	after macchanger
-	before wireless interface
-	functions interface_exists interface_down interface_del_addresses
-}
-
-# void rename_expose(void)
-#
-# Expose variables that can be configured
-rename_expose() {
-	variables rename
-}
-
-# bool rename_pre_start(char *iface)
-#
-# Checks to see if we have to rename the interface 
-rename_pre_start() {
-	local iface="$1" newname="" mac ifvar="$(bash_variable "$1")"
-
-	interface_exists "${iface}" || return 0
-
-	newname="rename_${ifvar}"
-	[[ -z ${!newname} || ${iface} == "${!newname}" ]] && return 0
-
-	# We cannot rename vlan interfaces as /proc/net/vlan/config always
-	# returns the old interface name. We don't bail out though as it's
-	# not critical that the interface gets renamed.
-	if [[ -d /proc/net/vlan/config ]] ; then
-		if grep -q "^${iface} " /proc/net/vlan/config ; then
-			eerror "Cannot rename VLAN interfaces"
-			return 0
-		fi
-	fi
-
-	ebegin "Renaming \"${iface}\" to \"${!newname}\""
-
-	# Ensure that we have an init script
-	[[ ! -e "/etc/init.d/net.${!newname}" ]] \
-		&& ( cd /etc/init.d ; ln -s net.lo "net.${!newname}" )
-
-	# Ensure that the interface is down and without any addresses or we
-	# will not work
-	interface_del_addresses "${iface}"
-	interface_down "${iface}"
-	interface_set_name "${iface}" "${!newname}"
-	eend $? "Failed to rename interface" || return 1
-
-	# Mark us as stopped, start the new interface and bail cleanly
-	mark_service_stopped "net.${iface}"
-	einfo "Stopped configuration of ${iface} due to renaming"
-	service_stopped "net.${!newname}" && start_service "net.${!newname}"
-
-	exit 1 
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/rename.sh b/net-scripts/net.modules.d/rename.sh
new file mode 100644
index 0000000..43a6da1
--- /dev/null
+++ b/net-scripts/net.modules.d/rename.sh
@@ -0,0 +1,63 @@
+# Copyright (c) 2005-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void rename_depend(void)
+#
+# Sets up the dependancies for the module
+rename_depend() {
+	after macchanger
+	before wireless interface
+	functions interface_exists interface_down interface_del_addresses
+}
+
+# void rename_expose(void)
+#
+# Expose variables that can be configured
+rename_expose() {
+	variables rename
+}
+
+# bool rename_pre_start(char *iface)
+#
+# Checks to see if we have to rename the interface 
+rename_pre_start() {
+	local iface="$1" newname="" mac ifvar="$(bash_variable "$1")"
+
+	interface_exists "${iface}" || return 0
+
+	newname="rename_${ifvar}"
+	[[ -z ${!newname} || ${iface} == "${!newname}" ]] && return 0
+
+	# We cannot rename vlan interfaces as /proc/net/vlan/config always
+	# returns the old interface name. We don't bail out though as it's
+	# not critical that the interface gets renamed.
+	if [[ -d /proc/net/vlan/config ]] ; then
+		if grep -q "^${iface} " /proc/net/vlan/config ; then
+			eerror "Cannot rename VLAN interfaces"
+			return 0
+		fi
+	fi
+
+	ebegin "Renaming \"${iface}\" to \"${!newname}\""
+
+	# Ensure that we have an init script
+	[[ ! -e "/etc/init.d/net.${!newname}" ]] \
+		&& ( cd /etc/init.d ; ln -s net.lo "net.${!newname}" )
+
+	# Ensure that the interface is down and without any addresses or we
+	# will not work
+	interface_del_addresses "${iface}"
+	interface_down "${iface}"
+	interface_set_name "${iface}" "${!newname}"
+	eend $? "Failed to rename interface" || return 1
+
+	# Mark us as stopped, start the new interface and bail cleanly
+	mark_service_stopped "net.${iface}"
+	einfo "Stopped configuration of ${iface} due to renaming"
+	service_stopped "net.${!newname}" && start_service "net.${!newname}"
+
+	exit 1 
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/system b/net-scripts/net.modules.d/system
deleted file mode 100644
index 5d841d3..0000000
--- a/net-scripts/net.modules.d/system
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright (c) 2005-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# void system_depend(void)
-#
-# Sets up the dependancies for the module
-system_depend() {
-	after interface
-	before dhcp
-}
-
-# void system_expose(void)
-#
-# Expose variables that can be configured
-system_expose() {
-	variables dns_servers dns_domain dns_options dns_search dns_sortlist \
-		ntp_servers nis_domain nis_servers
-}
-
-system_dns_extra() {
-	local iface="$1" ifvar="$(bash_variable "$1")" out="$2" x sortlist
-	local -a options
-	
-	x="dns_options_${ifvar}[@]"
-	options=( "${!x}" )
-	[[ -z ${options} ]] && options=( "${dns_options[@]}" )
-	for x in "${options[@]}" ; do
-		echo "options ${x}" >> "${out}"
-	done
-
-	sortlist="dns_sortlist_${ifvar}"
-	[[ -z ${!sortlist} ]] && sortlist="dns_sortlist"
-	[[ -n ${!sortlist} ]] && echo "sortlist ${!sortlist}" >> "${out}"
-}
-
-system_dns() {
-	local iface="$1" ifvar="$(bash_variable "$1")" x domain search
-	local conffile="${statedir}/${iface}/resolv.conf" tmpfile="${conffile}.$$"
-	local -a servers
-
-	servers="dns_servers_${ifvar}[@]"
-	[[ -z ${!servers} ]] && servers="dns_servers[@]"
-	servers="${!servers}"
-
-	domain="dns_domain_${ifvar}"
-	[[ -z ${!domain} ]] && domain="dns_domain"
-	domain="${!domain}"
-
-	search="dns_search_${ifvar}"
-	[[ -z ${!search} ]] && search="dns_search"
-	search="${!search}"
-	
-	[[ -z ${servers} && -z ${domain} && -z ${search} ]] && return 0
-
-	echo "# Generated by net-scripts for interface ${iface}" > "${tmpfile}"
-	chmod 644 "${tmpfile}"
-
-	if [[ -n ${domain} ]] ; then
-		# Strip leading and trailing spaces
-		domain="${domain# *}"
-		domain="${domain%* }"
-		if [[ ${domain} == *" "* ]] ; then
-			[[ -z ${search} ]] && search="${domain}"
-			domain="${domain%% *}"
-		fi
-		echo "domain ${domain}" >> "${tmpfile}"
-	fi
-
-	for x in ${servers} ; do
-		echo "nameserver ${x}" >> "${tmpfile}"
-	done
-
-	[[ -n ${search} ]] && echo "search ${search}" >> "${tmpfile}"
-
-	system_dns_extra "${iface}" "${tmpfile}"
-
-	mv "${tmpfile}" "${conffile}"
-}
-
-system_ntp() {
-	local iface="$1" ifvar="$(bash_variable "$1")" x
-	local conffile="${statedir}/${iface}/ntp.conf" tmpfile="${conffile}.$$"
-	local -a servers
-
-	servers="ntp_servers_${ifvar}[@]"
-	[[ -z ${!servers} ]] && servers="ntp_servers[@]"
-	[[ -z ${!servers} ]] && return 0
-
-	echo "# Generated by net-scripts for interface ${iface}" > "${tmpfile}"
-	chmod 644 "${tmpfile}"
-
-	echo "restrict default noquery notrust nomodify" >> "${tmpfile}"
-	echo "restrict 127.0.0.1" >> "${tmpfile}"
-
-	for x in ${!servers} ; do
-		echo "restrict ${x} nomodify notrap noquery" >> "${tmpfile}"
-		echo "server ${x}" >> "${tmpfile}"
-	done
-
-	echo "driftfile /var/lib/ntp/ntp.drift" >> "${tmpfile}"
-	echo "logfile /var/log/ntp.log" >> "${tmpfile}"
-
-	mv "${tmpfile}" "${conffile}"
-}
-
-system_nis() {
-	local iface="$1" ifvar="$(bash_variable "$1")" domain x
-	local conffile="${statedir}/${iface}/yp.conf" tmpfile="${conffile}.$$"
-	local -a servers 
-
-	servers="nis_servers_${ifvar}[@]"
-	[[ -z ${!servers} ]] && servers="nis_servers[@]"
-	
-	domain="nis_domain_${ifvar}"
-	[[ -z ${!domain} ]] && domain="nis_domain"
-	
-	[[ -z ${!servers} && -z ${!domain} ]] && return 0
-
-	echo "# Generated by net-scripts for interface ${iface}" > "${tmpfile}" 
-	chmod 644 "${tmpfile}"
-
-	if [[ -n ${!domain} ]] ; then
-		hostname -y "${!domain}"
-		if [[ -n ${!servers} ]] ; then
-			for x in ${!servers} ; do
-				echo "domain ${!domain} server ${x}" >> "${tmpfile}"
-			done
-		else
-			echo "domain ${!domain} broadcast" >> "${tmpfile}"
-		fi
-	else
-		for x in ${!servers} ; do
-			echo "ypserver ${x}" >> "${tmpfile}"
-		done
-	fi
-
-	mv "${tmpfile}" "${conffile}"
-}
-
-# bool system_post_start(char *iface)
-#
-# Configures the host system for dns, ntp and nis information
-# Always returns 0
-system_pre_start() {
-	local iface="$1"
-
-	system_dns "${iface}"
-	system_ntp "${iface}"
-	system_nis "${iface}"
-
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/system.sh b/net-scripts/net.modules.d/system.sh
new file mode 100644
index 0000000..5d841d3
--- /dev/null
+++ b/net-scripts/net.modules.d/system.sh
@@ -0,0 +1,155 @@
+# Copyright (c) 2005-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# void system_depend(void)
+#
+# Sets up the dependancies for the module
+system_depend() {
+	after interface
+	before dhcp
+}
+
+# void system_expose(void)
+#
+# Expose variables that can be configured
+system_expose() {
+	variables dns_servers dns_domain dns_options dns_search dns_sortlist \
+		ntp_servers nis_domain nis_servers
+}
+
+system_dns_extra() {
+	local iface="$1" ifvar="$(bash_variable "$1")" out="$2" x sortlist
+	local -a options
+	
+	x="dns_options_${ifvar}[@]"
+	options=( "${!x}" )
+	[[ -z ${options} ]] && options=( "${dns_options[@]}" )
+	for x in "${options[@]}" ; do
+		echo "options ${x}" >> "${out}"
+	done
+
+	sortlist="dns_sortlist_${ifvar}"
+	[[ -z ${!sortlist} ]] && sortlist="dns_sortlist"
+	[[ -n ${!sortlist} ]] && echo "sortlist ${!sortlist}" >> "${out}"
+}
+
+system_dns() {
+	local iface="$1" ifvar="$(bash_variable "$1")" x domain search
+	local conffile="${statedir}/${iface}/resolv.conf" tmpfile="${conffile}.$$"
+	local -a servers
+
+	servers="dns_servers_${ifvar}[@]"
+	[[ -z ${!servers} ]] && servers="dns_servers[@]"
+	servers="${!servers}"
+
+	domain="dns_domain_${ifvar}"
+	[[ -z ${!domain} ]] && domain="dns_domain"
+	domain="${!domain}"
+
+	search="dns_search_${ifvar}"
+	[[ -z ${!search} ]] && search="dns_search"
+	search="${!search}"
+	
+	[[ -z ${servers} && -z ${domain} && -z ${search} ]] && return 0
+
+	echo "# Generated by net-scripts for interface ${iface}" > "${tmpfile}"
+	chmod 644 "${tmpfile}"
+
+	if [[ -n ${domain} ]] ; then
+		# Strip leading and trailing spaces
+		domain="${domain# *}"
+		domain="${domain%* }"
+		if [[ ${domain} == *" "* ]] ; then
+			[[ -z ${search} ]] && search="${domain}"
+			domain="${domain%% *}"
+		fi
+		echo "domain ${domain}" >> "${tmpfile}"
+	fi
+
+	for x in ${servers} ; do
+		echo "nameserver ${x}" >> "${tmpfile}"
+	done
+
+	[[ -n ${search} ]] && echo "search ${search}" >> "${tmpfile}"
+
+	system_dns_extra "${iface}" "${tmpfile}"
+
+	mv "${tmpfile}" "${conffile}"
+}
+
+system_ntp() {
+	local iface="$1" ifvar="$(bash_variable "$1")" x
+	local conffile="${statedir}/${iface}/ntp.conf" tmpfile="${conffile}.$$"
+	local -a servers
+
+	servers="ntp_servers_${ifvar}[@]"
+	[[ -z ${!servers} ]] && servers="ntp_servers[@]"
+	[[ -z ${!servers} ]] && return 0
+
+	echo "# Generated by net-scripts for interface ${iface}" > "${tmpfile}"
+	chmod 644 "${tmpfile}"
+
+	echo "restrict default noquery notrust nomodify" >> "${tmpfile}"
+	echo "restrict 127.0.0.1" >> "${tmpfile}"
+
+	for x in ${!servers} ; do
+		echo "restrict ${x} nomodify notrap noquery" >> "${tmpfile}"
+		echo "server ${x}" >> "${tmpfile}"
+	done
+
+	echo "driftfile /var/lib/ntp/ntp.drift" >> "${tmpfile}"
+	echo "logfile /var/log/ntp.log" >> "${tmpfile}"
+
+	mv "${tmpfile}" "${conffile}"
+}
+
+system_nis() {
+	local iface="$1" ifvar="$(bash_variable "$1")" domain x
+	local conffile="${statedir}/${iface}/yp.conf" tmpfile="${conffile}.$$"
+	local -a servers 
+
+	servers="nis_servers_${ifvar}[@]"
+	[[ -z ${!servers} ]] && servers="nis_servers[@]"
+	
+	domain="nis_domain_${ifvar}"
+	[[ -z ${!domain} ]] && domain="nis_domain"
+	
+	[[ -z ${!servers} && -z ${!domain} ]] && return 0
+
+	echo "# Generated by net-scripts for interface ${iface}" > "${tmpfile}" 
+	chmod 644 "${tmpfile}"
+
+	if [[ -n ${!domain} ]] ; then
+		hostname -y "${!domain}"
+		if [[ -n ${!servers} ]] ; then
+			for x in ${!servers} ; do
+				echo "domain ${!domain} server ${x}" >> "${tmpfile}"
+			done
+		else
+			echo "domain ${!domain} broadcast" >> "${tmpfile}"
+		fi
+	else
+		for x in ${!servers} ; do
+			echo "ypserver ${x}" >> "${tmpfile}"
+		done
+	fi
+
+	mv "${tmpfile}" "${conffile}"
+}
+
+# bool system_post_start(char *iface)
+#
+# Configures the host system for dns, ntp and nis information
+# Always returns 0
+system_pre_start() {
+	local iface="$1"
+
+	system_dns "${iface}"
+	system_ntp "${iface}"
+	system_nis "${iface}"
+
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/tuntap b/net-scripts/net.modules.d/tuntap
deleted file mode 100644
index e0d1865..0000000
--- a/net-scripts/net.modules.d/tuntap
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Fix any potential localisation problems
-# Note that LC_ALL trumps LC_anything_else according to locale(7)
-openvpn() {
-	LC_ALL=C /usr/sbin/openvpn "$@"
-}
-tunctl() {
-	LC_ALL=C /usr/bin/tunctl "$@"
-}
-
-# void tuntap_depend(void)
-#
-# Sets up the dependancies for the module
-tuntap_depend() {
-	before interface macchanger
-	functions interface_exists interface_type
-}
-
-# void tuntap_expose(void)
-#
-# Expose variables that can be configured
-tuntap_expose() {
-	variables tunctl
-}
-
-# bool tuntap_check_installed(void)
-#
-# Returns 1 if tuntap is installed, otherwise 0
-tuntap_check_installed() {
-	[[ -x /usr/sbin/openvpn ]] && return 0
-	[[ -x /usr/bin/tunctl ]] && return 0
-	${1:-false} && eerror "For TunTap support, emerge net-misc/openvpn or sys-apps/usermode-utilities"
-	return 1
-}
-
-# bool tuntap_check_kernel(void)
-#
-# Checks to see if the tun is present - if not try and load it
-# Returns 1 if there is a problem
-tuntap_check_kernel() {
-	[[ -a /dev/net/tun ]] && return 0
-	/sbin/modprobe tun && sleep 1
-	[[ -a /dev/net/tun ]] && return 0
-	eerror "TUN/TAP support is not present in this kernel"
-	return 1
-}
-
-# bool tuntap_exists(char *interface)
-#
-# Returns 0 if the tun/tap interface exists, otherwise 1
-tuntap_exists() {
-	local itype="$(interface_type "$1")"
-	[[ ${itype} != "tun" && ${itype} != "tap" ]] && return 1
-	interface_exists "$1"
-}
-
-# bool tuntap_pre_start(char *iface)
-#
-# Create the device, give it the right perms
-tuntap_pre_start() {
-	local iface="$1" itype="$(interface_type "$1")"
-
-	# Check that we are a valid tun/tap interface
-	# NOTE - the name can be anything as we define it
-	# but for simplicity in the config we require either
-	# tun or tap
-	[[ ${itype} != "tun" && ${itype} != "tap" ]] && return 0
-
-	tuntap_check_kernel || return 1
-
-	ebegin "Creating Tun/Tap interface ${iface}"
-	if [[ -x /usr/sbin/openvpn ]] ; then
-		openvpn --mktun --dev "${iface}" >/dev/null
-	else
-		local ifvar="$(bash_variable "${iface}")"
-		local opts="tunctl_${ifvar}"
-		tunctl ${!opts} -t "${iface}" >/dev/null
-	fi
-	eend $?
-}
-
-# bool tuntap_stop(char *iface)
-#
-# Removes the device
-tuntap_stop() {
-	local iface="$1"
-
-	tuntap_check_installed || return 0
-	tuntap_exists "${iface}" || return 0
-
-	ebegin "Destroying Tun/Tap interface ${iface}"
-	if [[ -x /usr/sbin/openvpn ]] ; then
-		openvpn --rmtun --dev "${iface}" >/dev/null
-	else
-		tunctl -d "${fiace}" >/dev/null
-	fi
-	eend $?
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/tuntap.sh b/net-scripts/net.modules.d/tuntap.sh
new file mode 100644
index 0000000..e0d1865
--- /dev/null
+++ b/net-scripts/net.modules.d/tuntap.sh
@@ -0,0 +1,103 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# Fix any potential localisation problems
+# Note that LC_ALL trumps LC_anything_else according to locale(7)
+openvpn() {
+	LC_ALL=C /usr/sbin/openvpn "$@"
+}
+tunctl() {
+	LC_ALL=C /usr/bin/tunctl "$@"
+}
+
+# void tuntap_depend(void)
+#
+# Sets up the dependancies for the module
+tuntap_depend() {
+	before interface macchanger
+	functions interface_exists interface_type
+}
+
+# void tuntap_expose(void)
+#
+# Expose variables that can be configured
+tuntap_expose() {
+	variables tunctl
+}
+
+# bool tuntap_check_installed(void)
+#
+# Returns 1 if tuntap is installed, otherwise 0
+tuntap_check_installed() {
+	[[ -x /usr/sbin/openvpn ]] && return 0
+	[[ -x /usr/bin/tunctl ]] && return 0
+	${1:-false} && eerror "For TunTap support, emerge net-misc/openvpn or sys-apps/usermode-utilities"
+	return 1
+}
+
+# bool tuntap_check_kernel(void)
+#
+# Checks to see if the tun is present - if not try and load it
+# Returns 1 if there is a problem
+tuntap_check_kernel() {
+	[[ -a /dev/net/tun ]] && return 0
+	/sbin/modprobe tun && sleep 1
+	[[ -a /dev/net/tun ]] && return 0
+	eerror "TUN/TAP support is not present in this kernel"
+	return 1
+}
+
+# bool tuntap_exists(char *interface)
+#
+# Returns 0 if the tun/tap interface exists, otherwise 1
+tuntap_exists() {
+	local itype="$(interface_type "$1")"
+	[[ ${itype} != "tun" && ${itype} != "tap" ]] && return 1
+	interface_exists "$1"
+}
+
+# bool tuntap_pre_start(char *iface)
+#
+# Create the device, give it the right perms
+tuntap_pre_start() {
+	local iface="$1" itype="$(interface_type "$1")"
+
+	# Check that we are a valid tun/tap interface
+	# NOTE - the name can be anything as we define it
+	# but for simplicity in the config we require either
+	# tun or tap
+	[[ ${itype} != "tun" && ${itype} != "tap" ]] && return 0
+
+	tuntap_check_kernel || return 1
+
+	ebegin "Creating Tun/Tap interface ${iface}"
+	if [[ -x /usr/sbin/openvpn ]] ; then
+		openvpn --mktun --dev "${iface}" >/dev/null
+	else
+		local ifvar="$(bash_variable "${iface}")"
+		local opts="tunctl_${ifvar}"
+		tunctl ${!opts} -t "${iface}" >/dev/null
+	fi
+	eend $?
+}
+
+# bool tuntap_stop(char *iface)
+#
+# Removes the device
+tuntap_stop() {
+	local iface="$1"
+
+	tuntap_check_installed || return 0
+	tuntap_exists "${iface}" || return 0
+
+	ebegin "Destroying Tun/Tap interface ${iface}"
+	if [[ -x /usr/sbin/openvpn ]] ; then
+		openvpn --rmtun --dev "${iface}" >/dev/null
+	else
+		tunctl -d "${fiace}" >/dev/null
+	fi
+	eend $?
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/udhcpc b/net-scripts/net.modules.d/udhcpc
deleted file mode 100644
index 041afb2..0000000
--- a/net-scripts/net.modules.d/udhcpc
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Fix any potential localisation problems
-# Note that LC_ALL trumps LC_anything_else according to locale(7)
-udhcpc() {
-	LC_ALL=C /sbin/udhcpc "$@"
-}
-
-# void udhcpc_depend(void)
-#
-# Sets up the dependancies for the module
-udhcpc_depend() {
-	after interface
-	provide dhcp
-	functions interface_exists interface_get_address
-}
-
-# void udhcpc_expose(void)
-#
-# Expose variables that can be configured
-udhcpc_expose() {
-	variables udhcpc dhcp
-}
-
-# bool udhcpc_check_installed(void)
-#
-# Returns 1 if udhcpc is installed, otherwise 0
-udhcpc_check_installed() {
-	[[ -x /sbin/udhcpc ]] && return 0
-	${1:-false} && eerror "For DHCP (udhcpc) support, emerge net-misc/udhcp"
-	return 1
-}
-
-# bool udhcpc_stop(char *iface)
-#
-# Stops udhcpc running on an interface
-# Return 1 if we fail to stop udhcpc (if it's running) otherwise 0
-udhcpc_stop() {
-	local iface="$1" pidfile="/var/run/udhcpc-$1.pid" d
-
-	[[ ! -f ${pidfile} ]] && return 0
-
-	ebegin "Stopping udhcpc on ${iface}"
-	local pid="$(<"${pidfile}")" e=true
-
-	local ifvar="$(bash_variable "${iface}")"
-	d="dhcp_${ifvar}"
-	d=" ${!d} "
-	[[ ${d} == "  " ]] && d=" ${dhcp} "
-
-	if [[ ${d} == *" release "* ]]; then
-		kill -s USR2 "${pid}" &>/dev/null
-		[[ -f "/var/cache/udhcpc-${iface}.lease" ]] \
-			&& rm "/var/cache/udhcpc-${iface}.lease"
-	fi
-
-	start-stop-daemon --stop --exec /sbin/udhcpc --pidfile "${pidfile}"
-	eend $?
-}
-
-# bool udhcpc_start(char *iface)
-#
-# Start DHCP on an interface by calling udhcpc $iface $options
-#
-# Returns 0 (true) when a DHCP address is obtained, otherwise 1
-udhcpc_start() {
-	local iface="$1" opts pidfile="/var/run/udhcpc-$1.pid"
-	local cachefile="/var/cache/udhcpc-$1.lease" d
-
-	interface_exists "${iface}" true || return 1
-
-	local ifvar="$(bash_variable "${iface}" )" opts 
-	opts="udhcpc_${ifvar}"
-	opts="${!opts}"
-
-	d="dhcp_${ifvar}"
-	d=" ${!d} "
-	[[ ${d} == "  " ]] && d=" ${dhcp} "
-
-	if [[ " ${d} " != *" nosendhost "* ]]; then
-		if [[ ! " ${opts}" =~ " -([hH] |-hostname=)" ]]; then
-			local hname="$(hostname)"
-			[[ -n ${hname} && ${hname} != "(none)" && ${hname} != "localhost" ]] \
-				&& opts="${opts} --hostname=${hname}"
-		fi
-	fi
-
-	# Bring up DHCP for this interface (or alias)
-	ebegin "Running udhcpc"
-
-	# Try and load the cache if it exists
-	if [[ -f ${cachefile} ]]; then
-		if [[ " ${opts}" != *" --request="* && " ${opts} " != *" -r "* ]]; then
-			local x="$(<"${cachefile}")"
-			# Check for a valid ip
-			[[ ${x} == *.*.*.* ]] && opts="${opts} --request=${x}"
-		fi
-	fi
-
-	x="$( eval udhcpc "${opts}" --now --pidfile="${pidfile}" \
-		--interface="${iface}" \
-		--script="${MODULES_DIR}/helpers.d/udhcpc-wrapper" 2>&1 \
-		| egrep -v '^info,' )"
-	# We just check the last 5 letters
-	[[ ${x:((${#x} - 5)):5} == "bound" ]]
-	eend "$?" "${x}" || return 1
-
-	# DHCP succeeded, show address retrieved
-	local addr="$(interface_get_address "${iface}")"
-	einfo "${iface} received address ${addr}"
-
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/udhcpc.sh b/net-scripts/net.modules.d/udhcpc.sh
new file mode 100644
index 0000000..041afb2
--- /dev/null
+++ b/net-scripts/net.modules.d/udhcpc.sh
@@ -0,0 +1,117 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# Fix any potential localisation problems
+# Note that LC_ALL trumps LC_anything_else according to locale(7)
+udhcpc() {
+	LC_ALL=C /sbin/udhcpc "$@"
+}
+
+# void udhcpc_depend(void)
+#
+# Sets up the dependancies for the module
+udhcpc_depend() {
+	after interface
+	provide dhcp
+	functions interface_exists interface_get_address
+}
+
+# void udhcpc_expose(void)
+#
+# Expose variables that can be configured
+udhcpc_expose() {
+	variables udhcpc dhcp
+}
+
+# bool udhcpc_check_installed(void)
+#
+# Returns 1 if udhcpc is installed, otherwise 0
+udhcpc_check_installed() {
+	[[ -x /sbin/udhcpc ]] && return 0
+	${1:-false} && eerror "For DHCP (udhcpc) support, emerge net-misc/udhcp"
+	return 1
+}
+
+# bool udhcpc_stop(char *iface)
+#
+# Stops udhcpc running on an interface
+# Return 1 if we fail to stop udhcpc (if it's running) otherwise 0
+udhcpc_stop() {
+	local iface="$1" pidfile="/var/run/udhcpc-$1.pid" d
+
+	[[ ! -f ${pidfile} ]] && return 0
+
+	ebegin "Stopping udhcpc on ${iface}"
+	local pid="$(<"${pidfile}")" e=true
+
+	local ifvar="$(bash_variable "${iface}")"
+	d="dhcp_${ifvar}"
+	d=" ${!d} "
+	[[ ${d} == "  " ]] && d=" ${dhcp} "
+
+	if [[ ${d} == *" release "* ]]; then
+		kill -s USR2 "${pid}" &>/dev/null
+		[[ -f "/var/cache/udhcpc-${iface}.lease" ]] \
+			&& rm "/var/cache/udhcpc-${iface}.lease"
+	fi
+
+	start-stop-daemon --stop --exec /sbin/udhcpc --pidfile "${pidfile}"
+	eend $?
+}
+
+# bool udhcpc_start(char *iface)
+#
+# Start DHCP on an interface by calling udhcpc $iface $options
+#
+# Returns 0 (true) when a DHCP address is obtained, otherwise 1
+udhcpc_start() {
+	local iface="$1" opts pidfile="/var/run/udhcpc-$1.pid"
+	local cachefile="/var/cache/udhcpc-$1.lease" d
+
+	interface_exists "${iface}" true || return 1
+
+	local ifvar="$(bash_variable "${iface}" )" opts 
+	opts="udhcpc_${ifvar}"
+	opts="${!opts}"
+
+	d="dhcp_${ifvar}"
+	d=" ${!d} "
+	[[ ${d} == "  " ]] && d=" ${dhcp} "
+
+	if [[ " ${d} " != *" nosendhost "* ]]; then
+		if [[ ! " ${opts}" =~ " -([hH] |-hostname=)" ]]; then
+			local hname="$(hostname)"
+			[[ -n ${hname} && ${hname} != "(none)" && ${hname} != "localhost" ]] \
+				&& opts="${opts} --hostname=${hname}"
+		fi
+	fi
+
+	# Bring up DHCP for this interface (or alias)
+	ebegin "Running udhcpc"
+
+	# Try and load the cache if it exists
+	if [[ -f ${cachefile} ]]; then
+		if [[ " ${opts}" != *" --request="* && " ${opts} " != *" -r "* ]]; then
+			local x="$(<"${cachefile}")"
+			# Check for a valid ip
+			[[ ${x} == *.*.*.* ]] && opts="${opts} --request=${x}"
+		fi
+	fi
+
+	x="$( eval udhcpc "${opts}" --now --pidfile="${pidfile}" \
+		--interface="${iface}" \
+		--script="${MODULES_DIR}/helpers.d/udhcpc-wrapper" 2>&1 \
+		| egrep -v '^info,' )"
+	# We just check the last 5 letters
+	[[ ${x:((${#x} - 5)):5} == "bound" ]]
+	eend "$?" "${x}" || return 1
+
+	# DHCP succeeded, show address retrieved
+	local addr="$(interface_get_address "${iface}")"
+	einfo "${iface} received address ${addr}"
+
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/vlan b/net-scripts/net.modules.d/vlan
deleted file mode 100644
index 393bc72..0000000
--- a/net-scripts/net.modules.d/vlan
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Fix any potential localisation problems
-# Note that LC_ALL trumps LC_anything_else according to locale(7)
-vconfig() {
-	LC_ALL=C /sbin/vconfig "$@"
-}
-
-# void vlan_depend(void)
-#
-# Sets up the dependancies for the module
-vlan_depend() {
-	after interface
-	before dhcp
-	functions iface_start iface_stop
-}
-
-# void vlan_expose(void)
-#
-# Expose variables that can be configured
-vlan_expose() {
-	variables vlans 
-}
-
-# bool vlan_check_installed(void)
-#
-# Returns 0 if vconfig is installed, otherwise 1
-vlan_check_installed() {
-	[[ -x /sbin/vconfig ]] && return 0
-	${1:-false} && eerror "For VLAN (802.1q) support, emerge net-misc/vconfig"
-	return 1
-}
-
-# bool vlan_exists(char *interface)
-#
-# Returns 0 if the interface is a vlan, otherwise 1
-vlan_exists() {
-	[[ ! -d /proc/net/vlan ]] && return 1
-	egrep -q "^$1[[:space:]]+" /proc/net/vlan/config
-}
-
-# char* vlan_get_vlans(char *interface)
-#
-# Fetch the configured vlans for an interface.  Outputs a space
-# separated list on stdout.  For example "eth0.1 eth0.2 eth0.3"
-vlan_get_vlans() {
-	sed -n -e 's/^\(.*[0-9]\) \(.* \) .*'"$1"'$/\1/p' \
-		/proc/net/vlan/config 2>/dev/null
-}
-
-# bool vlan_check_kernel(void)
-#
-# Checks to see if the 802.1q module is present - if not try and load it
-# Returns 1 if there is a problem
-vlan_check_kernel() {
-	[[ -d /proc/net/vlan ]] && return 0
-	/sbin/modprobe 8021q &>/dev/null
-	[[ -d /proc/net/vlan ]] && return 0
-	eerror "VLAN (802.1q) support is not present in this kernel"
-	return 1
-}
-
-#bool vlan_pre_start(char *iface)
-#
-# Setup vconfig
-vlan_pre_start() {
-	local iface="$1" opts i x e ifvar="$(bash_variable "$1")"
-	
-	opts="vconfig_${ifvar}[@]"
-	[[ -z ${!opts} ]] && return 0
-	opts=( "${!opts}" )
-
-	vlan_check_kernel || return 1
-	interface_exists "${iface}" || return 1
-
-	for (( i=0; i<${#opts[@]}; i++ )) ; do
-		if [[ ${opts[i]} == "set_name_type "* ]]; then
-			x="${opts[i]}"
-		else
-			x="${opts[i]/ / ${iface} }"
-			[[ ${x} == "${opts[i]}" ]] && x="${x} ${iface}"
-		fi
-		e="$(vconfig ${x} 2>&1 1>/dev/null)"
-		[[ -z ${e} ]] && continue
-		eerror "vconfig ${x}"
-		eerror "${e}"
-		return 1
-	done
-
-	return 0
-}
-
-# bool vlan_post_start(char *iface)
-#
-# Starts VLANs for a given interface
-#
-# Always returns 0 (true) 
-vlan_post_start() {
-	local iface="$1" vlan vlans vlans_old e ifname ifvar="$(bash_variable "$1")"
-
-	vlans="vlans_${ifvar}[@]"
-
-	# BACKWARD COMPATIBILITY: check for old vlan variable name
-	vlans_old="iface_${ifvar}_vlans"
-	[[ -n ${!vlans_old} && -z ${!vlans} ]] && vlans="vlans_old"
-
-	[[ -z ${!vlans} ]] && return 0
-
-	vlan_check_kernel || return 1
-	interface_exists "${iface}" true || return 1
-
-	# Start vlans for this interface
-	for vlan in ${!vlans} ; do
-		einfo "Adding VLAN ${vlan} to ${iface}"
-		e="$(vconfig add "${iface}" "${vlan}" 2>&1 1>/dev/null)"
-		if [[ -n ${e} ]] ; then
-			eend 1 "${e}"
-			continue
-		fi
-		eend 0
-
-		# We need to work out the interface name of our new vlan id
-		ifname="$( \
-			sed -n -e 's/^\([^ \t]*\) *| '"${vlan}"' *| .*'"${iface}"'$/\1/p' \
-			/proc/net/vlan/config
-		)"
-		iface_start "${ifname}"
-	done
-
-	return 0
-}
-
-# bool vlan_stop(char *iface)
-#
-# Stops VLANs for a given interface
-#
-# Always returns 0 (true) 
-vlan_stop() {
-	local iface="$1" vlan
-
-	vlan_check_installed || return 0
-
-	for vlan in $(vlan_get_vlans "${iface}"); do
-		einfo "Removing VLAN ${vlan##*.} from ${iface}"
-		iface_stop "${vlan}"
-		vconfig rem "${vlan}" >/dev/null
-	done
-
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/vlan.sh b/net-scripts/net.modules.d/vlan.sh
new file mode 100644
index 0000000..393bc72
--- /dev/null
+++ b/net-scripts/net.modules.d/vlan.sh
@@ -0,0 +1,154 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# Fix any potential localisation problems
+# Note that LC_ALL trumps LC_anything_else according to locale(7)
+vconfig() {
+	LC_ALL=C /sbin/vconfig "$@"
+}
+
+# void vlan_depend(void)
+#
+# Sets up the dependancies for the module
+vlan_depend() {
+	after interface
+	before dhcp
+	functions iface_start iface_stop
+}
+
+# void vlan_expose(void)
+#
+# Expose variables that can be configured
+vlan_expose() {
+	variables vlans 
+}
+
+# bool vlan_check_installed(void)
+#
+# Returns 0 if vconfig is installed, otherwise 1
+vlan_check_installed() {
+	[[ -x /sbin/vconfig ]] && return 0
+	${1:-false} && eerror "For VLAN (802.1q) support, emerge net-misc/vconfig"
+	return 1
+}
+
+# bool vlan_exists(char *interface)
+#
+# Returns 0 if the interface is a vlan, otherwise 1
+vlan_exists() {
+	[[ ! -d /proc/net/vlan ]] && return 1
+	egrep -q "^$1[[:space:]]+" /proc/net/vlan/config
+}
+
+# char* vlan_get_vlans(char *interface)
+#
+# Fetch the configured vlans for an interface.  Outputs a space
+# separated list on stdout.  For example "eth0.1 eth0.2 eth0.3"
+vlan_get_vlans() {
+	sed -n -e 's/^\(.*[0-9]\) \(.* \) .*'"$1"'$/\1/p' \
+		/proc/net/vlan/config 2>/dev/null
+}
+
+# bool vlan_check_kernel(void)
+#
+# Checks to see if the 802.1q module is present - if not try and load it
+# Returns 1 if there is a problem
+vlan_check_kernel() {
+	[[ -d /proc/net/vlan ]] && return 0
+	/sbin/modprobe 8021q &>/dev/null
+	[[ -d /proc/net/vlan ]] && return 0
+	eerror "VLAN (802.1q) support is not present in this kernel"
+	return 1
+}
+
+#bool vlan_pre_start(char *iface)
+#
+# Setup vconfig
+vlan_pre_start() {
+	local iface="$1" opts i x e ifvar="$(bash_variable "$1")"
+	
+	opts="vconfig_${ifvar}[@]"
+	[[ -z ${!opts} ]] && return 0
+	opts=( "${!opts}" )
+
+	vlan_check_kernel || return 1
+	interface_exists "${iface}" || return 1
+
+	for (( i=0; i<${#opts[@]}; i++ )) ; do
+		if [[ ${opts[i]} == "set_name_type "* ]]; then
+			x="${opts[i]}"
+		else
+			x="${opts[i]/ / ${iface} }"
+			[[ ${x} == "${opts[i]}" ]] && x="${x} ${iface}"
+		fi
+		e="$(vconfig ${x} 2>&1 1>/dev/null)"
+		[[ -z ${e} ]] && continue
+		eerror "vconfig ${x}"
+		eerror "${e}"
+		return 1
+	done
+
+	return 0
+}
+
+# bool vlan_post_start(char *iface)
+#
+# Starts VLANs for a given interface
+#
+# Always returns 0 (true) 
+vlan_post_start() {
+	local iface="$1" vlan vlans vlans_old e ifname ifvar="$(bash_variable "$1")"
+
+	vlans="vlans_${ifvar}[@]"
+
+	# BACKWARD COMPATIBILITY: check for old vlan variable name
+	vlans_old="iface_${ifvar}_vlans"
+	[[ -n ${!vlans_old} && -z ${!vlans} ]] && vlans="vlans_old"
+
+	[[ -z ${!vlans} ]] && return 0
+
+	vlan_check_kernel || return 1
+	interface_exists "${iface}" true || return 1
+
+	# Start vlans for this interface
+	for vlan in ${!vlans} ; do
+		einfo "Adding VLAN ${vlan} to ${iface}"
+		e="$(vconfig add "${iface}" "${vlan}" 2>&1 1>/dev/null)"
+		if [[ -n ${e} ]] ; then
+			eend 1 "${e}"
+			continue
+		fi
+		eend 0
+
+		# We need to work out the interface name of our new vlan id
+		ifname="$( \
+			sed -n -e 's/^\([^ \t]*\) *| '"${vlan}"' *| .*'"${iface}"'$/\1/p' \
+			/proc/net/vlan/config
+		)"
+		iface_start "${ifname}"
+	done
+
+	return 0
+}
+
+# bool vlan_stop(char *iface)
+#
+# Stops VLANs for a given interface
+#
+# Always returns 0 (true) 
+vlan_stop() {
+	local iface="$1" vlan
+
+	vlan_check_installed || return 0
+
+	for vlan in $(vlan_get_vlans "${iface}"); do
+		einfo "Removing VLAN ${vlan##*.} from ${iface}"
+		iface_stop "${vlan}"
+		vconfig rem "${vlan}" >/dev/null
+	done
+
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/wpa_supplicant b/net-scripts/net.modules.d/wpa_supplicant
deleted file mode 100644
index 22343a7..0000000
--- a/net-scripts/net.modules.d/wpa_supplicant
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Fix any potential localisation problems
-# Note that LC_ALL trumps LC_anything_else according to locale(7)
-wpa_supplicant() {
-	LC_ALL=C /sbin/wpa_supplicant "$@"
-}
-
-wpa_cli() {
-	LC_ALL=C /bin/wpa_cli "$@"
-}
-
-# void wpa_supplicant_depend(void)
-#
-# Sets up the dependancies for the module
-wpa_supplicant_depend() {
-	after macnet plug
-	before interface
-	provide wireless
-	functions interface_exists
-}
-
-# void wpa_supplicant_expose(void)
-#
-# Expose variables that can be configured
-wpa_supplicant_expose() {
-	variables associate_timeout wpa_supplicant
-}
-
-# bool wpa_supplicant_check_installed(void)
-#
-# Returns 0 if wpa_supplicant is installed, otherwise 1
-wpa_supplicant_check_installed() {
-	local report="${1:-false}" installed="0"
-	if [[ ! -x /sbin/wpa_supplicant ]] ; then
-		installed="1"
-		${report} && eerror "For WPA support (wpa_supplicant) support, emerge net-wireless/wpa_supplicant"
-	fi
-	if [[ ! -e /proc/net/packet ]] ; then
-		installed="1"
-		if ${report} ; then
-			eerror "wpa_supplicant requires Packet Socket"
-			eerror "(CONFIG_PACKET=y) enabled in the kernel"
-		fi
-	fi
-	return "${installed}"
-}
-
-# bool wpa_supplicant_exists(char *interface)
-#
-# Checks to see if wireless extensions are enabled on the interface
-wpa_supplicant_exists() {
-	[[ ! -e /proc/net/wireless ]] && return 1
-	grep -q "^[ \t]*$1:[ \t]" /proc/net/wireless
-}
-
-# char* wpa_supplicant_get_essid(char *interface)
-#
-# Gets the current ESSID of iface
-wpa_supplicant_get_essid() {
-	local i essid
-
-	for (( i=0; i<5; i++ )); do
-		essid="$( wpa_cli -i"$1" status | sed -n -e 's/^ssid=//p' )"
-		if [[ -n ${essid} ]] ; then
-			echo "${essid}"
-			return 0
-		fi
-		sleep 1
-	done
-
-	return 1
-}
-
-# char* wpa_supplicant_get_ap_mac_address(char *interface)
-#
-# Returns the MAC address of the Access Point
-# the interface is connected to
-wpa_supplicant_get_ap_mac_address() {
-	wpa_cli -i"$1" status | sed -n -e 's/^bssid=\([^=]\+\).*/\U\1/p'
-}
-
-# bool wpa_supplicant_associated(char *interface)
-#
-# Returns 0 if we're associated correctly or 1 if not
-# Note that just because we are associated does not mean we are using the
-# correct encryption keys
-wpa_supplicant_associated() {
-	local -a status
-	eval status=( $( wpa_cli -i"$1" status | sed -n -e 's/^\(key_mgmt\|wpa_state\|EAP state\)=\([^=]\+\).*/\U\"\2\"/p' ) )
-
-	case "${status[0]}" in
-		"NONE")					[[ ${status[1]} == "ASSOCIATED" || ${status[1]} == "COMPLETED" ]] ;;
-		"IEEE 802.1X (no WPA)")	[[ ${status[2]} == "SUCCESS" ]] ;;
-		*)						[[ ${status[1]} == "COMPLETED" ]] ;;
-	esac
-
-	return $?
-}
-
-# void wpa_supplicant_kill(char *interface, bool report)
-#
-# Kills any existing wpa_supplicant process on the interface
-wpa_supplicant_kill() {
-	local iface="$1" report="${2:-false}" pidfile
-
-	# Shutdown wpa_cli first, if it's running
-	# This is important as future versions of wpa_supplicant
-	# may send a disconnect message to wpa_cli when it shutsdown
-	pidfile="/var/run/wpa_cli-${iface}.pid"
-	if [[ -f ${pidfile} ]] ; then
-		${report} && ebegin "Stopping wpa_cli on ${iface}"
-		start-stop-daemon --stop --exec /bin/wpa_cli --pidfile "${pidfile}"
-		${report} && eend "$?"
-	fi
-
-	# Now shutdown wpa_supplicant
-	pidfile="/var/run/wpa_supplicant-${iface}.pid"
-	if [[ -f ${pidfile} ]] ; then
-		${report} && ebegin "Stopping wpa_supplicant on ${iface}"
-		start-stop-daemon --stop --exec /sbin/wpa_supplicant \
-			--pidfile "${pidfile}"
-		${report} && eend "$?"
-	else
-		# Support wpa_supplicant-0.3.x
-		local pid="$( pgrep -f "^/sbin/wpa_supplicant .* -i${iface}[ ]*$" )"
-		if [[ -n ${pid} ]] ; then
-			${report} && ebegin "Stopping wpa_supplicant on ${iface}"
-			kill -s TERM "${pid}"
-			${report} && eend 0
-		fi
-	fi
-
-	# If wpa_supplicant exits uncleanly, we need to remove the stale dir
-	[[ -S "/var/run/wpa_supplicant/${iface}" ]] \
-		&& rm -f "/var/run/wpa_supplicant/${iface}"
-}
-
-# bool wpa_supplicant_associate(char *interface)
-#
-# Returns 0 if wpa_supplicant associates and authenticates to an AP
-# otherwise, 1
-wpa_supplicant_associate() {
-	local iface="$1" ifvar="$(bash_variable "$1")" timeout
-	timeout="associate_timeout_${ifvar}"
-	[[ -z ${!timeout} ]] && timeout="wpa_timeout_${ifvar}"
-	timeout="${!timeout:--1}"
-
-	if [[ ${timeout} == "0" ]] ; then
-		ewarn "WARNING: infinite timeout set for association on ${iface}"
-	elif [[ ${timeout} -lt 0 ]] ; then
-		einfo "Backgrounding ..."
-		exit 0
-	fi
-
-	local i=0
-	while true ; do
-		if [[ -n ${actfile} ]] ; then
-			service_started "net.${iface}" && return 0
-		else
-			if ! wpa_cli -i"${iface}" status &>/dev/null ; then
-				eend 1 "wpa_supplicant has exited unexpectedly"
-				return 1
-			fi
-			wpa_supplicant_associated "${iface}" && return 0
-		fi
-		sleep 1
-		[[ ${timeout} == "0" ]] && continue
-		(( i++ ))
-		[[ ${i} == "${timeout}" || ${i} -gt "${timeout}" ]] && break
-	done
-
-	# Spit out an appropriate error
-	if [[ -n ${actfile} ]] ; then
-		eend 1 "Failed to configure ${iface} in the background"
-	else
-		eend 1 "Timed out"
-	fi
-
-	# exit without error with wpa_supplicant-0.4.x as we may get kickstarted
-	# when an AP comes in range
-	[[ -n ${actfile} ]] && exit 0
-
-	# Kill wpa_supplicant for 0.3.x
-	wpa_supplicant_kill "${iface}"
-	return 1
-}
-
-# bool wpa_supplicant_pre_start(char *interface)
-#
-# Start wpa_supplicant on an interface and wait for association
-# Returns 0 (true) when successful, non-zero otherwise
-wpa_supplicant_pre_start() {
-	local iface="$1" opts="" timeout="" actfile="" cfgfile=""
-
-	# We don't configure wireless if we're being called from
-	# the background unless we're not currently running
-	if ${IN_BACKGROUND} ; then
-		if service_started_daemon "net.${iface}" /sbin/wpa_supplicant ; then
-			if wpa_supplicant_exists "${iface}" ; then
-				ESSID="$( wpa_supplicant_get_essid "${iface}" )"
-				ESSIDVAR="$( bash_variable "${ESSID}" )"
-				save_options "ESSID" "${ESSID}"
-			fi
-			return 0
-		fi
-	fi
-
-	save_options "ESSID" ""
-
-	local ifvar="$( bash_variable "${iface}" )"
-	opts="wpa_supplicant_${ifvar}"
-	opts=" ${!opts} "
-	[[ ${opts} != *" -D"* ]] \
-		&& vewarn "wpa_supplicant_${ifvar} does not define a driver"
-	
-	# We only work on wirelesss interfaces unless a driver for wired
-	# has been defined
-	if [[ ${opts} != *" -Dwired "* && ${opts} != *" -D wired "* ]] ; then
-		if ! wpa_supplicant_exists "${iface}" ; then
-			veinfo "wpa_supplicant only works on wireless interfaces"
-			veinfo "unless the -D wired option is specified"
-			return 0
-		fi
-	fi
-
-	# Check for rf_kill - only ipw supports this at present, but other
-	# cards may in the future
-	if [[ -e "/sys/class/net/${iface}/device/rf_kill" ]] ; then
-		if [[ $( < "/sys/class/net/${iface}/device/rf_kill" ) != 0 ]] ; then
-			eerror "Wireless radio has been killed for interface ${iface}"
-			return 1
-		fi
-	fi
-
-	# If wireless-tools is installed, try and apply our user config
-	# This is needed for some drivers - such as hostap because they start
-	# the card in Master mode which causes problems with wpa_supplicant.
-	if is_function iwconfig_defaults ; then
-		if wpa_supplicant_exists "${iface}" ; then
-			iwconfig_defaults "${iface}"
-			iwconfig_user_config "${iface}"
-		fi
-	fi	
-
-	ebegin "Starting wpa_supplicant on ${iface}"
-
-	cfgfile="${opts##* -c}"
-	if [[ -n ${cfgfile} && ${cfgfile} != "${opts}" ]] ; then
-		[[ ${cfgfile:0:1} == " " ]] && cfgfile="${cfgfile# *}"
-		cfgfile="${cfgfile%% *}"
-	else
-		# Support new and old style locations
-		cfgfile="/etc/wpa_supplicant/wpa_supplicant-${iface}.conf"
-		[[ ! -e ${cfgfile} ]] \
-			&& cfgfile="/etc/wpa_supplicant/wpa_supplicant.conf"
-		[[ ! -e ${cfgfile} ]] \
-			&& cfgfile="/etc/wpa_supplicant.conf"
-		opts="${opts} -c${cfgfile}"
-	fi
-
-	if [[ ! -f ${cfgfile} ]] ; then
-		eend 1 "configuration file ${cfgfile} not found!"
-		return 1
-	fi
-
-	local ctrl_dir="$( sed -n -e 's/[ \t]*#.*//g;s/[ \t]*$//g;s/^ctrl_interface=//p' "${cfgfile}" )"
-	if [[ ${ctrl_dir} != "/var/run/wpa_supplicant" ]] ; then
-		eerror "${cfgfile} must set"
-		eerror "  ctrl_interface=/var/run/wpa_supplicant"
-		eend 1
-		return 1
-	fi
-
-	# Some drivers require the interface to be up
-	interface_up "${iface}"
-
-	version="$( wpa_cli -v | sed -n -e 's/wpa_cli v//p' )"
-	version=( ${version//./ } )
-	(( version = version[0] * 1000 + version[1] * 100 + version[2] ))
-
-	# wpa_supplicant 0.4.0 and greater supports wpa_cli actions
-	# This is very handy as if and when different association mechanisms are
-	# introduced to wpa_supplicant we don't have to recode for them as
-	# wpa_cli is now responsible for informing us of success/failure.
-	# The downside of this is that we don't see the interface being configured
-	# for DHCP/static.
-	if [[ ${version} -gt 399 ]] ; then
-		opts="${opts} -W -P/var/run/wpa_supplicant-${iface}.pid"
-		actfile="/etc/wpa_supplicant/wpa_cli.sh"
-		# Support old file location
-		[[ ! -x ${actfile} ]] && actfile="/sbin/wpa_cli.action"
-		[[ ! -x ${actfile} ]] && unset actfile
-	fi
-
-	eval start-stop-daemon --start --exec /sbin/wpa_supplicant \
-		--pidfile "/var/run/wpa_supplicant-${iface}.pid" \
-		-- "${opts}" -B -i"${iface}"
-	eend "$?" || return 1
-
-	# Starting wpa_supplication-0.4.0, we can get wpa_cli to
-	# start/stop our scripts from wpa_supplicant messages
-	if [[ -n ${actfile} ]] ; then
-		mark_service_inactive "net.${iface}"
-		ebegin "Starting wpa_cli on ${iface}"
-		start-stop-daemon --start --exec /bin/wpa_cli \
-			--pidfile "/var/run/wpa_cli-${iface}.pid" \
-			-- -a"${actfile}" -i"${iface}" \
-			-P"/var/run/wpa_cli-${iface}.pid" -B
-		eend "$?" || return 1
-	fi
-
-	eindent
-	veinfo "Waiting for association"
-	eend 0
-
-	wpa_supplicant_associate "${iface}" || return 1
-
-	# Only report wireless info for wireless interfaces
-	if wpa_supplicant_exists "${iface}" ; then
-		# Set ESSID for essidnet and report
-		ESSID="$( wpa_supplicant_get_essid "${iface}" )"
-		ESSIDVAR="$( bash_variable "${ESSID}" )"
-		save_options "ESSID" "${ESSID}"
-
-		local -a status
-		eval status=( $( wpa_cli -i"${iface}" status | sed -n -e 's/^\(bssid\|pairwise_cipher\|key_mgmt\)=\([^=]\+\).*/\"\U\2\"/p' | tr '[:lower:]' '[:upper:]' ) )
-		einfo "${iface} connected to \"${ESSID//\\\\/\\\\}\" at ${status[0]}"
-
-		if [[ ${status[2]} == "NONE" ]] ; then
-			if [[ ${status[1]} == "NONE" ]] ; then
-				ewarn "not using any encryption"
-			else
-				veinfo "using ${status[1]}"
-			fi
-		else
-			veinfo "using ${status[2]}/${status[1]}"
-		fi
-		eoutdent
-	else
-		einfo "${iface} connected"
-	fi
-
-	if [[ -n ${actfile} ]] ; then
-		local addr="$( interface_get_address "${iface}" )"
-		einfo "${iface} configured with address ${addr}"
-		exit 0 
-	fi
-
-	return 0
-}
-
-# bool wpa_supplicant_post_stop(char *iface)
-#
-# Stops wpa_supplicant on an interface
-# Returns 0 (true) when successful, non-zero otherwise
-wpa_supplicant_post_stop() {
-	if ${IN_BACKGROUND} ; then
-		# Only stop wpa_supplicant if it's not the controlling daemon
-		! service_started_daemon "net.$1" /sbin/wpa_supplicant 0
-	fi
-	[[ $? == 0 ]] && wpa_supplicant_kill "$1" true
-	return 0
-}
-
-# vim: set ft=sh ts=4 :
diff --git a/net-scripts/net.modules.d/wpa_supplicant.sh b/net-scripts/net.modules.d/wpa_supplicant.sh
new file mode 100644
index 0000000..22343a7
--- /dev/null
+++ b/net-scripts/net.modules.d/wpa_supplicant.sh
@@ -0,0 +1,368 @@
+# Copyright (c) 2004-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Contributed by Roy Marples (uberlord@gentoo.org)
+
+# Fix any potential localisation problems
+# Note that LC_ALL trumps LC_anything_else according to locale(7)
+wpa_supplicant() {
+	LC_ALL=C /sbin/wpa_supplicant "$@"
+}
+
+wpa_cli() {
+	LC_ALL=C /bin/wpa_cli "$@"
+}
+
+# void wpa_supplicant_depend(void)
+#
+# Sets up the dependancies for the module
+wpa_supplicant_depend() {
+	after macnet plug
+	before interface
+	provide wireless
+	functions interface_exists
+}
+
+# void wpa_supplicant_expose(void)
+#
+# Expose variables that can be configured
+wpa_supplicant_expose() {
+	variables associate_timeout wpa_supplicant
+}
+
+# bool wpa_supplicant_check_installed(void)
+#
+# Returns 0 if wpa_supplicant is installed, otherwise 1
+wpa_supplicant_check_installed() {
+	local report="${1:-false}" installed="0"
+	if [[ ! -x /sbin/wpa_supplicant ]] ; then
+		installed="1"
+		${report} && eerror "For WPA support (wpa_supplicant) support, emerge net-wireless/wpa_supplicant"
+	fi
+	if [[ ! -e /proc/net/packet ]] ; then
+		installed="1"
+		if ${report} ; then
+			eerror "wpa_supplicant requires Packet Socket"
+			eerror "(CONFIG_PACKET=y) enabled in the kernel"
+		fi
+	fi
+	return "${installed}"
+}
+
+# bool wpa_supplicant_exists(char *interface)
+#
+# Checks to see if wireless extensions are enabled on the interface
+wpa_supplicant_exists() {
+	[[ ! -e /proc/net/wireless ]] && return 1
+	grep -q "^[ \t]*$1:[ \t]" /proc/net/wireless
+}
+
+# char* wpa_supplicant_get_essid(char *interface)
+#
+# Gets the current ESSID of iface
+wpa_supplicant_get_essid() {
+	local i essid
+
+	for (( i=0; i<5; i++ )); do
+		essid="$( wpa_cli -i"$1" status | sed -n -e 's/^ssid=//p' )"
+		if [[ -n ${essid} ]] ; then
+			echo "${essid}"
+			return 0
+		fi
+		sleep 1
+	done
+
+	return 1
+}
+
+# char* wpa_supplicant_get_ap_mac_address(char *interface)
+#
+# Returns the MAC address of the Access Point
+# the interface is connected to
+wpa_supplicant_get_ap_mac_address() {
+	wpa_cli -i"$1" status | sed -n -e 's/^bssid=\([^=]\+\).*/\U\1/p'
+}
+
+# bool wpa_supplicant_associated(char *interface)
+#
+# Returns 0 if we're associated correctly or 1 if not
+# Note that just because we are associated does not mean we are using the
+# correct encryption keys
+wpa_supplicant_associated() {
+	local -a status
+	eval status=( $( wpa_cli -i"$1" status | sed -n -e 's/^\(key_mgmt\|wpa_state\|EAP state\)=\([^=]\+\).*/\U\"\2\"/p' ) )
+
+	case "${status[0]}" in
+		"NONE")					[[ ${status[1]} == "ASSOCIATED" || ${status[1]} == "COMPLETED" ]] ;;
+		"IEEE 802.1X (no WPA)")	[[ ${status[2]} == "SUCCESS" ]] ;;
+		*)						[[ ${status[1]} == "COMPLETED" ]] ;;
+	esac
+
+	return $?
+}
+
+# void wpa_supplicant_kill(char *interface, bool report)
+#
+# Kills any existing wpa_supplicant process on the interface
+wpa_supplicant_kill() {
+	local iface="$1" report="${2:-false}" pidfile
+
+	# Shutdown wpa_cli first, if it's running
+	# This is important as future versions of wpa_supplicant
+	# may send a disconnect message to wpa_cli when it shutsdown
+	pidfile="/var/run/wpa_cli-${iface}.pid"
+	if [[ -f ${pidfile} ]] ; then
+		${report} && ebegin "Stopping wpa_cli on ${iface}"
+		start-stop-daemon --stop --exec /bin/wpa_cli --pidfile "${pidfile}"
+		${report} && eend "$?"
+	fi
+
+	# Now shutdown wpa_supplicant
+	pidfile="/var/run/wpa_supplicant-${iface}.pid"
+	if [[ -f ${pidfile} ]] ; then
+		${report} && ebegin "Stopping wpa_supplicant on ${iface}"
+		start-stop-daemon --stop --exec /sbin/wpa_supplicant \
+			--pidfile "${pidfile}"
+		${report} && eend "$?"
+	else
+		# Support wpa_supplicant-0.3.x
+		local pid="$( pgrep -f "^/sbin/wpa_supplicant .* -i${iface}[ ]*$" )"
+		if [[ -n ${pid} ]] ; then
+			${report} && ebegin "Stopping wpa_supplicant on ${iface}"
+			kill -s TERM "${pid}"
+			${report} && eend 0
+		fi
+	fi
+
+	# If wpa_supplicant exits uncleanly, we need to remove the stale dir
+	[[ -S "/var/run/wpa_supplicant/${iface}" ]] \
+		&& rm -f "/var/run/wpa_supplicant/${iface}"
+}
+
+# bool wpa_supplicant_associate(char *interface)
+#
+# Returns 0 if wpa_supplicant associates and authenticates to an AP
+# otherwise, 1
+wpa_supplicant_associate() {
+	local iface="$1" ifvar="$(bash_variable "$1")" timeout
+	timeout="associate_timeout_${ifvar}"
+	[[ -z ${!timeout} ]] && timeout="wpa_timeout_${ifvar}"
+	timeout="${!timeout:--1}"
+
+	if [[ ${timeout} == "0" ]] ; then
+		ewarn "WARNING: infinite timeout set for association on ${iface}"
+	elif [[ ${timeout} -lt 0 ]] ; then
+		einfo "Backgrounding ..."
+		exit 0
+	fi
+
+	local i=0
+	while true ; do
+		if [[ -n ${actfile} ]] ; then
+			service_started "net.${iface}" && return 0
+		else
+			if ! wpa_cli -i"${iface}" status &>/dev/null ; then
+				eend 1 "wpa_supplicant has exited unexpectedly"
+				return 1
+			fi
+			wpa_supplicant_associated "${iface}" && return 0
+		fi
+		sleep 1
+		[[ ${timeout} == "0" ]] && continue
+		(( i++ ))
+		[[ ${i} == "${timeout}" || ${i} -gt "${timeout}" ]] && break
+	done
+
+	# Spit out an appropriate error
+	if [[ -n ${actfile} ]] ; then
+		eend 1 "Failed to configure ${iface} in the background"
+	else
+		eend 1 "Timed out"
+	fi
+
+	# exit without error with wpa_supplicant-0.4.x as we may get kickstarted
+	# when an AP comes in range
+	[[ -n ${actfile} ]] && exit 0
+
+	# Kill wpa_supplicant for 0.3.x
+	wpa_supplicant_kill "${iface}"
+	return 1
+}
+
+# bool wpa_supplicant_pre_start(char *interface)
+#
+# Start wpa_supplicant on an interface and wait for association
+# Returns 0 (true) when successful, non-zero otherwise
+wpa_supplicant_pre_start() {
+	local iface="$1" opts="" timeout="" actfile="" cfgfile=""
+
+	# We don't configure wireless if we're being called from
+	# the background unless we're not currently running
+	if ${IN_BACKGROUND} ; then
+		if service_started_daemon "net.${iface}" /sbin/wpa_supplicant ; then
+			if wpa_supplicant_exists "${iface}" ; then
+				ESSID="$( wpa_supplicant_get_essid "${iface}" )"
+				ESSIDVAR="$( bash_variable "${ESSID}" )"
+				save_options "ESSID" "${ESSID}"
+			fi
+			return 0
+		fi
+	fi
+
+	save_options "ESSID" ""
+
+	local ifvar="$( bash_variable "${iface}" )"
+	opts="wpa_supplicant_${ifvar}"
+	opts=" ${!opts} "
+	[[ ${opts} != *" -D"* ]] \
+		&& vewarn "wpa_supplicant_${ifvar} does not define a driver"
+	
+	# We only work on wirelesss interfaces unless a driver for wired
+	# has been defined
+	if [[ ${opts} != *" -Dwired "* && ${opts} != *" -D wired "* ]] ; then
+		if ! wpa_supplicant_exists "${iface}" ; then
+			veinfo "wpa_supplicant only works on wireless interfaces"
+			veinfo "unless the -D wired option is specified"
+			return 0
+		fi
+	fi
+
+	# Check for rf_kill - only ipw supports this at present, but other
+	# cards may in the future
+	if [[ -e "/sys/class/net/${iface}/device/rf_kill" ]] ; then
+		if [[ $( < "/sys/class/net/${iface}/device/rf_kill" ) != 0 ]] ; then
+			eerror "Wireless radio has been killed for interface ${iface}"
+			return 1
+		fi
+	fi
+
+	# If wireless-tools is installed, try and apply our user config
+	# This is needed for some drivers - such as hostap because they start
+	# the card in Master mode which causes problems with wpa_supplicant.
+	if is_function iwconfig_defaults ; then
+		if wpa_supplicant_exists "${iface}" ; then
+			iwconfig_defaults "${iface}"
+			iwconfig_user_config "${iface}"
+		fi
+	fi	
+
+	ebegin "Starting wpa_supplicant on ${iface}"
+
+	cfgfile="${opts##* -c}"
+	if [[ -n ${cfgfile} && ${cfgfile} != "${opts}" ]] ; then
+		[[ ${cfgfile:0:1} == " " ]] && cfgfile="${cfgfile# *}"
+		cfgfile="${cfgfile%% *}"
+	else
+		# Support new and old style locations
+		cfgfile="/etc/wpa_supplicant/wpa_supplicant-${iface}.conf"
+		[[ ! -e ${cfgfile} ]] \
+			&& cfgfile="/etc/wpa_supplicant/wpa_supplicant.conf"
+		[[ ! -e ${cfgfile} ]] \
+			&& cfgfile="/etc/wpa_supplicant.conf"
+		opts="${opts} -c${cfgfile}"
+	fi
+
+	if [[ ! -f ${cfgfile} ]] ; then
+		eend 1 "configuration file ${cfgfile} not found!"
+		return 1
+	fi
+
+	local ctrl_dir="$( sed -n -e 's/[ \t]*#.*//g;s/[ \t]*$//g;s/^ctrl_interface=//p' "${cfgfile}" )"
+	if [[ ${ctrl_dir} != "/var/run/wpa_supplicant" ]] ; then
+		eerror "${cfgfile} must set"
+		eerror "  ctrl_interface=/var/run/wpa_supplicant"
+		eend 1
+		return 1
+	fi
+
+	# Some drivers require the interface to be up
+	interface_up "${iface}"
+
+	version="$( wpa_cli -v | sed -n -e 's/wpa_cli v//p' )"
+	version=( ${version//./ } )
+	(( version = version[0] * 1000 + version[1] * 100 + version[2] ))
+
+	# wpa_supplicant 0.4.0 and greater supports wpa_cli actions
+	# This is very handy as if and when different association mechanisms are
+	# introduced to wpa_supplicant we don't have to recode for them as
+	# wpa_cli is now responsible for informing us of success/failure.
+	# The downside of this is that we don't see the interface being configured
+	# for DHCP/static.
+	if [[ ${version} -gt 399 ]] ; then
+		opts="${opts} -W -P/var/run/wpa_supplicant-${iface}.pid"
+		actfile="/etc/wpa_supplicant/wpa_cli.sh"
+		# Support old file location
+		[[ ! -x ${actfile} ]] && actfile="/sbin/wpa_cli.action"
+		[[ ! -x ${actfile} ]] && unset actfile
+	fi
+
+	eval start-stop-daemon --start --exec /sbin/wpa_supplicant \
+		--pidfile "/var/run/wpa_supplicant-${iface}.pid" \
+		-- "${opts}" -B -i"${iface}"
+	eend "$?" || return 1
+
+	# Starting wpa_supplication-0.4.0, we can get wpa_cli to
+	# start/stop our scripts from wpa_supplicant messages
+	if [[ -n ${actfile} ]] ; then
+		mark_service_inactive "net.${iface}"
+		ebegin "Starting wpa_cli on ${iface}"
+		start-stop-daemon --start --exec /bin/wpa_cli \
+			--pidfile "/var/run/wpa_cli-${iface}.pid" \
+			-- -a"${actfile}" -i"${iface}" \
+			-P"/var/run/wpa_cli-${iface}.pid" -B
+		eend "$?" || return 1
+	fi
+
+	eindent
+	veinfo "Waiting for association"
+	eend 0
+
+	wpa_supplicant_associate "${iface}" || return 1
+
+	# Only report wireless info for wireless interfaces
+	if wpa_supplicant_exists "${iface}" ; then
+		# Set ESSID for essidnet and report
+		ESSID="$( wpa_supplicant_get_essid "${iface}" )"
+		ESSIDVAR="$( bash_variable "${ESSID}" )"
+		save_options "ESSID" "${ESSID}"
+
+		local -a status
+		eval status=( $( wpa_cli -i"${iface}" status | sed -n -e 's/^\(bssid\|pairwise_cipher\|key_mgmt\)=\([^=]\+\).*/\"\U\2\"/p' | tr '[:lower:]' '[:upper:]' ) )
+		einfo "${iface} connected to \"${ESSID//\\\\/\\\\}\" at ${status[0]}"
+
+		if [[ ${status[2]} == "NONE" ]] ; then
+			if [[ ${status[1]} == "NONE" ]] ; then
+				ewarn "not using any encryption"
+			else
+				veinfo "using ${status[1]}"
+			fi
+		else
+			veinfo "using ${status[2]}/${status[1]}"
+		fi
+		eoutdent
+	else
+		einfo "${iface} connected"
+	fi
+
+	if [[ -n ${actfile} ]] ; then
+		local addr="$( interface_get_address "${iface}" )"
+		einfo "${iface} configured with address ${addr}"
+		exit 0 
+	fi
+
+	return 0
+}
+
+# bool wpa_supplicant_post_stop(char *iface)
+#
+# Stops wpa_supplicant on an interface
+# Returns 0 (true) when successful, non-zero otherwise
+wpa_supplicant_post_stop() {
+	if ${IN_BACKGROUND} ; then
+		# Only stop wpa_supplicant if it's not the controlling daemon
+		! service_started_daemon "net.$1" /sbin/wpa_supplicant 0
+	fi
+	[[ $? == 0 ]] && wpa_supplicant_kill "$1" true
+	return 0
+}
+
+# vim: set ft=sh ts=4 :
diff --git a/sbin/functions.sh b/sbin/functions.sh
index 1911236..e8d2d4e 100755
--- a/sbin/functions.sh
+++ b/sbin/functions.sh
@@ -214,8 +214,10 @@ ewarn() {
 		echo -e " ${WARN}*${NORMAL} ${RC_INDENTATION}$*"
 	fi
 
+	local name="rc-scripts"
+	[[ $0 != "/sbin/runscript.sh" ]] && name="${0##*/}"
 	# Log warnings to system log
-	esyslog "daemon.warning" "rc-scripts" "$*"
+	esyslog "daemon.warning" "${name}" "$*"
 
 	LAST_E_CMD="ewarn"
 	return 0
@@ -233,6 +235,8 @@ eerror() {
 		echo -e " ${BAD}*${NORMAL} ${RC_INDENTATION}$*"
 	fi
 
+	local name="rc-scripts"
+	[[ $0 != "/sbin/runscript.sh" ]] && name="${0##*/}"
 	# Log errors to system log
 	esyslog "daemon.err" "rc-scripts" "$*"
 
@@ -466,35 +470,6 @@ dolisting() {
 	echo "${mylist}"
 }
 
-# void save_options(char *option, char *optstring)
-#
-#    save the settings ("optstring") for "option"
-#
-save_options() {
-	local myopts="$1"
-
-	shift
-	if [[ ! -d "${svcdir}/options/${SVCNAME}" ]] ; then
-		mkdir -p -m 0755 "${svcdir}/options/${SVCNAME}"
-	fi
-
-	echo "$*" > "${svcdir}/options/${SVCNAME}/${myopts}"
-
-	return 0
-}
-
-# char *get_options(char *option)
-#
-#    get the "optstring" for "option" that was saved
-#    by calling the save_options function
-#
-get_options() {
-	if [[ -f "${svcdir}/options/${SVCNAME}/$1" ]] ; then
-		echo "$(< ${svcdir}/options/${SVCNAME}/$1)"
-	fi
-
-	return 0
-}
 
 # char *add_suffix(char * configfile)
 #
@@ -669,6 +644,19 @@ requote() {
 	echo "$*"
 }
 
+# char* uniqify(char *arg, ...)
+#
+#   Ensure that params are unique
+#
+uniqify() {
+    local result= x=
+    while [[ -n "$1" ]] ; do
+		[[ " ${result} " != *" $1 "* ]] && result="${result} $1"
+		shift
+	done
+    echo "${result# *}"
+}
+
 ##############################################################################
 #                                                                            #
 # This should be the last code in here, please add all functions above!!     #
diff --git a/sbin/rc b/sbin/rc
index eb4a78d..ca7c710 100755
--- a/sbin/rc
+++ b/sbin/rc
@@ -119,7 +119,17 @@ else
 	else
 		# Non-normal runlevels don't include boot scripts as default
 		mylevels="$(dolisting "/etc/runlevels/${SOFTLEVEL}/")"
-	fi
+
+		# As we're in the bootlevel, add any services that failed due
+		# to /dev/.rcsysinit existing to the list
+		if [[ -d /dev/.rcafterinit ]] ; then
+			for x in $(dolisting /dev/.rcafterinit/) ; do
+				[[ -L ${x} ]] && myscripts="${myscripts} ${x##*/}"
+			done
+			einfo "Device initiated services:${HILITE}${myscripts}${NORMAL}"
+			rm -rf /dev/.rcafterinit
+		fi
+ 	fi
 	
 	for x in ${mylevels} ; do
 		[[ -L ${x} ]] && myscripts="${myscripts} ${x##*/}"
diff --git a/sbin/rc-daemon.sh b/sbin/rc-daemon.sh
index 81ca457..3d89447 100755
--- a/sbin/rc-daemon.sh
+++ b/sbin/rc-daemon.sh
@@ -265,7 +265,7 @@ rc_start_daemon() {
 # Returns 0 if everything was successful otherwise 1
 rc_stop_daemon() {
 	local pid pids retval="0"
-
+	
 	if [[ -n ${cmd} ]]; then
 		if ! is_daemon_running ${cmd} "${pidfile}" ; then
 			[[ ${RC_FAIL_ON_ZOMBIE} == "yes" ]] && return 1
diff --git a/sbin/rc-services.sh b/sbin/rc-services.sh
index 199a8d2..df0b557 100755
--- a/sbin/rc-services.sh
+++ b/sbin/rc-services.sh
@@ -255,11 +255,40 @@ is_runlevel_stop() {
 	[[ -d "${svcdir}/softscripts.new" ]]
 }
 
+# void save_options(char *option, char *optstring)
+#
+#    save the settings ("optstring") for "option"
+#
+save_options() {
+	local myopts="$1"
+
+	shift
+	if [[ ! -d "${svcdir}/options/${SVCNAME}" ]] ; then
+		mkdir -p -m 0755 "${svcdir}/options/${SVCNAME}"
+	fi
+
+	echo "$*" > "${svcdir}/options/${SVCNAME}/${myopts}"
+}
+
+# char *get_options(char *option)
+#
+#    get the "optstring" for "option" that was saved
+#    by calling the save_options function
+#
+get_options() {
+	local svc="${SVCNAME}"
+	[[ -n $2 ]] && svc="$2"
+	
+	if [[ -f "${svcdir}/options/${svc}/$1" ]] ; then
+		echo "$(< ${svcdir}/options/${svc}/$1)"
+	fi
+}
+
 # void sevice_message([char *type] char *message)
 #
 # Print out a service message if we are on parallel
 service_message() {
-	[[ ${RC_PARALLEL_STARTUP} != "yes" ]] && return
+	[[ ${RC_PARALLEL_STARTUP} != "yes" || ${RC_QUIET} == "yes" ]] && return
 
 	local cmd="einfo"
 	case "$1" in
diff --git a/sbin/runscript.sh b/sbin/runscript.sh
index 2c184c8..3a4dd6f 100755
--- a/sbin/runscript.sh
+++ b/sbin/runscript.sh
@@ -26,6 +26,9 @@ myservice="${SVCNAME}"
 # Stop init scripts from working until sysinit completes
 if [[ -e /dev/.rcsysinit ]] ; then
 	eerror "ERROR:  cannot run ${SVCNAME} until sysinit completes"
+	# Try to add this service to a queue when sysinit has completed
+	[[ ! -d /dev/.rcafterinit ]] && mkdir /dev/.rcafterinit
+	ln -snf "$1" /dev/.rcafterinit/"${SVCNAME}"
 	exit 1
 fi
 
@@ -85,9 +88,9 @@ service_inactive "${SVCNAME}"
 svcinactive="$?"
 svc_quit() {
 	eerror "ERROR:  ${SVCNAME} caught an interrupt"
-	if service_inactive "${SVCNAME}" || [[ ${svcinactive} == 0 ]] ; then
+	if service_inactive "${SVCNAME}" || [[ ${svcinactive} == "0" ]] ; then
 		mark_service_inactive "${SVCNAME}"
-	elif [[ ${svcstarted} == 0 ]] ; then
+	elif [[ ${svcstarted} == "0" ]] ; then
 		mark_service_started "${SVCNAME}"
 	else
 		mark_service_stopped "${SVCNAME}"
@@ -175,7 +178,7 @@ svc_stop() {
 		ewarn "WARNING:  you are stopping a boot service."
 	fi
 	
-	if [[ ${svcpause} != "yes" ]] ; then
+	if [[ ${svcpause} != "yes" && ${RC_NO_DEPS} != "yes" ]] ; then
 		if [[ ${NETSERVICE} == "yes" ]] ; then
 			# A net.* service
 			if in_runlevel "${SVCNAME}" "${BOOTLEVEL}" || \
@@ -219,7 +222,7 @@ svc_stop() {
 
 	IN_BACKGROUND="${ib_save}"
 
-	if [[ ${retval} != 0 ]] ; then
+	if [[ ${retval} != "0" ]] ; then
 		eerror "ERROR:  problems stopping dependent services."
 		eerror "        ${SVCNAME} is still up."
 	else
@@ -240,7 +243,7 @@ svc_stop() {
 
 		# If a service has been marked inactive, exit now as something
 		# may attempt to start it again later
-		if service_inactive "${SVCNAME}" ; then
+		if [[ ${retval} == "0" ]] && service_inactive "${SVCNAME}" ; then
 			svcinactive=0
 			return 0
 		fi
@@ -255,7 +258,7 @@ svc_stop() {
 		if [[ ${SOFTLEVEL} == "reboot" || ${SOFTLEVEL} == "shutdown" ]] ; then
 			mark_service_stopped "${SVCNAME}"
 		else
-			if [[ ${svcinactive} == 0 ]] ; then
+			if [[ ${svcinactive} == "0" ]] ; then
 				mark_service_inactive "${SVCNAME}"
 			else
 				mark_service_started "${SVCNAME}"
@@ -309,82 +312,88 @@ svc_start() {
 
 	service_message "Service ${SVCNAME} starting"
 
+	if broken "${SVCNAME}" ; then
+		eerror "ERROR:  Some services needed are missing.  Run"
+		eerror "        './${SVCNAME} broken' for a list of those"
+		eerror "        services.  ${SVCNAME} was not started."
+		retval=1	
+	fi
+
 	# Save the IN_BACKGROUND var as we need to clear it for starting depends
 	local ib_save="${IN_BACKGROUND}"
 	unset IN_BACKGROUND
 
-	local startupservices="$(ineed "${SVCNAME}") $(valid_iuse "${SVCNAME}")"
-	local netservices=
-	for x in $(dolisting "/etc/runlevels/${BOOTLEVEL}/net.*") \
-		$(dolisting "/etc/runlevels/${mylevel}/net.*") ; do
-		netservices="${netservices} ${x##*/}"
-	done
-
-	# Start dependencies, if any.
-	if ! is_runlevel_start ; then
-		for x in ${startupservices} ; do
-			if [[ ${x} == "net" && ${NETSERVICE} != "yes" ]] && ! is_net_up ; then
-				for y in ${netservices} ; do
-					service_stopped "${y}" && start_service "${y}"
-				done
-			elif [[ ${x} != "net" ]] ; then
-				if service_stopped "${x}" ; then
-					start_service "${x}"
-				fi	
-			fi
+	if [[ ${retval} == "0" && ${RC_NO_DEPS} != "yes" ]] ; then
+		local startupservices="$(ineed "${SVCNAME}") $(valid_iuse "${SVCNAME}")"
+		local netservices=
+		for x in $(dolisting "/etc/runlevels/${BOOTLEVEL}/net.*") \
+			$(dolisting "/etc/runlevels/${mylevel}/net.*") ; do
+			netservices="${netservices} ${x##*/}"
 		done
-	fi
 
-	# We also wait for any services we're after to finish incase they
-	# have a "before" dep but we don't dep on them.
-	if is_runlevel_start ; then
-		startupservices="${startupservices} $(valid_iafter "${SVCNAME}")"
-	fi
+		# Start dependencies, if any.
+		if ! is_runlevel_start ; then
+			for x in ${startupservices} ; do
+				if [[ ${x} == "net" && ${NETSERVICE} != "yes" ]] && ! is_net_up ; then
+					for y in ${netservices} ; do
+						service_stopped "${y}" && start_service "${y}"
+					done
+				elif [[ ${x} != "net" ]] ; then
+					if service_stopped "${x}" ; then
+						start_service "${x}"
+					fi	
+				fi
+			done
+		fi
 
-	if [[ " ${startupservices} " == *" net "* ]] ; then
-		startupservices=" ${startupservices} "
-		startupservices="${startupservices/ net / ${netservices} }"
-		startupservices="${startupservices// net /}"
-	fi
+		# We also wait for any services we're after to finish incase they
+		# have a "before" dep but we don't dep on them.
+		if is_runlevel_start ; then
+			startupservices="${startupservices} $(valid_iafter "${SVCNAME}")"
+		fi
 
-	# Wait for dependencies to finish.
-	for x in ${startupservices} ; do
-		service_started "${x}" && continue
-		wait_service "${x}"
-		if ! service_started "${x}" ; then
-			# A 'need' dependency is critical for startup
-			if ineed -t "${SVCNAME}" "${x}" >/dev/null \
-				|| net_service "${x}" && ineed -t "${SVCNAME}" net \
-				&& ! is_net_up ; then
-				if service_inactive "${x}" || service_wasinactive "${x}" || \
-				[[ -n $(ls "${svcdir}"/scheduled/*/"${x}" 2>/dev/null) ]] ; then
-					svc_schedule_start "${x}" "${SVCNAME}"
-					[[ -n ${startinactive} ]] && startinactive="${startinactive}, "
-					startinactive="${startinactive}${x}"
-				else
-					startfail="${x}"
-					break
+		if [[ " ${startupservices} " == *" net "* ]] ; then
+			startupservices=" ${startupservices} "
+			startupservices="${startupservices/ net / ${netservices} }"
+			startupservices="${startupservices// net /}"
+		fi
+
+		# Wait for dependencies to finish.
+		for x in ${startupservices} ; do
+			service_started "${x}" && continue
+			wait_service "${x}"
+			if ! service_started "${x}" ; then
+				# A 'need' dependency is critical for startup
+				if ineed -t "${SVCNAME}" "${x}" >/dev/null \
+					|| net_service "${x}" && ineed -t "${SVCNAME}" net \
+					&& ! is_net_up ; then
+					if service_inactive "${x}" || service_wasinactive "${x}" || \
+						[[ -n $(ls "${svcdir}"/scheduled/*/"${x}" 2>/dev/null) ]] ; then
+						svc_schedule_start "${x}" "${SVCNAME}"
+						[[ -n ${startinactive} ]] && startinactive="${startinactive}, "
+						startinactive="${startinactive}${x}"
+					else
+						startfail="${x}"
+						break
+					fi
 				fi
 			fi
+		done
+
+		if [[ -n ${startfail} ]] ; then
+			eerror "ERROR:  Problem starting needed service ${startfail}"
+			eerror "        ${SVCNAME} was not started."
+			retval=1
+		elif [[ -n ${startinactive} ]] ; then
+			# Change the last , to or for correct grammar.
+			x="${startinactive##*, }"
+			startinactive="${startinactive/%, ${x}/ or ${x}}"
+			ewarn "WARNING:  ${SVCNAME} is scheduled to start when ${startinactive} has started."
+			retval=1
 		fi
-	done
-	
-	if [[ -n ${startfail} ]] ; then
-		eerror "ERROR:  Problem starting needed service ${startfail}"
-		eerror "        ${SVCNAME} was not started."
-		retval=1
-	elif [[ -n ${startinactive} ]] ; then
-		# Change the last , to or for correct grammar.
-		x="${startinactive##*, }"
-		startinactive="${startinactive/%, ${x}/ or ${x}}"
-		ewarn "WARNING:  ${SVCNAME} is scheduled to start when ${startinactive} has started."
-		retval=1
-	elif broken "${SVCNAME}" ; then
-		eerror "ERROR:  Some services needed are missing.  Run"
-		eerror "        './${SVCNAME} broken' for a list of those"
-		eerror "        services.  ${SVCNAME} was not started."
-		retval=1
-	else
+	fi
+		
+	if [[ ${retval} == "0" ]] ; then
 		IN_BACKGROUND="${ib_save}"
 		(
 		exit() {
@@ -407,15 +416,15 @@ svc_start() {
 		
 		# If a service has been marked inactive, exit now as something
 		# may attempt to start it again later
-		if service_inactive "${SVCNAME}" ; then
+		if [[ ${retval} == "0" ]] && service_inactive "${SVCNAME}" ; then
 			svcinactive=0
 			service_message "ewarn" "WARNING:  ${SVCNAME} has started but is inactive"
 			return 1
 		fi
 	fi
 
-	if [[ ${retval} != 0 ]] ; then
-		if [[ ${svcinactive} == 0 ]] ; then
+	if [[ ${retval} != "0" ]] ; then
+		if [[ ${svcinactive} == "0" ]] ; then
 			mark_service_inactive "${SVCNAME}"
 		else
 			mark_service_stopped "${SVCNAME}"
@@ -531,12 +540,16 @@ fi
 for arg in $* ; do
 	case "${arg}" in
 	--quiet)
+		RC_QUIET="yes"
 		RC_QUIET_STDOUT="yes"
 		;;
 # We check this in functions.sh ...
 #	--nocolor)
 #		RC_NOCOLOR="yes"
 #		;;
+	--nodeps)
+		RC_NO_DEPS="yes"
+		;;
 	--verbose)
 		RC_VERBOSE="yes"
 		;;
@@ -652,7 +665,7 @@ for arg in $* ; do
 		retval="$?"
 		svcpause="no"
 		;;
-	--quiet|--nocolor)
+	--quiet|--nocolor|--nodeps)
 		;;
 	help)
 		exec "${svclib}"/sh/rc-help.sh "${myscript}" help
-- 
cgit v1.2.3-65-gdbad