Merging revision 1798

svn path=/baselayout-vserver/branches/baselayout-1_12/; revision=197

5 files changed, 16 insertions, 8 deletions

diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index ccf6ae1..a3dace6 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -7,6 +7,10 @@
 
 	ChangeLog                                             |   23 +++++++++
 	ChangeLog.vserver                                     |   15 ++++++
+	conf.d/wireless.example      |    3 +++
+	net.modules.d/bonding        |    8 ++++----
+	net.modules.d/iwconfig       |    7 ++++---
+	net.modules.d/wpa_supplicant |    2 +-
 	net-scripts/conf.d/wireless.example                   |   12 +++-
 	net-scripts/net.modules.d/helpers.d/module-loader     |    4 +
 	net-scripts/net.modules.d/iwconfig                    |   45 ++++++++++--------
diff --git a/net-scripts/conf.d/wireless.example b/net-scripts/conf.d/wireless.example
index b50afdc..a73a488 100644
--- a/net-scripts/conf.d/wireless.example
+++ b/net-scripts/conf.d/wireless.example
@@ -104,6 +104,9 @@
 #	"set EncrypType=TKIP"
 #	"set WPAPSK=yourpasskey"
 #)
+#NOTE: Even though you can use WPA like so, you may have to set a WEP key
+#if your driver claims the AP is encrypted. The WEP key itself will not be
+#used though.
 
 # Seconds to wait before scanning
 # Some drivers need to wait until they have finished "loading"
diff --git a/net-scripts/net.modules.d/bonding b/net-scripts/net.modules.d/bonding
index 7e1cb3d..a717ccb 100644
--- a/net-scripts/net.modules.d/bonding
+++ b/net-scripts/net.modules.d/bonding
@@ -53,14 +53,14 @@ bonding_pre_start() {
 	einfo "${!slaves}"
 
 	# Check that our slaves exist
-	for s in "${!slaves}" ; do
+	for s in ${!slaves} ; do
 		interface_exists "${s}" && continue
 		ewarn "interface ${s} does not exist"
 		return 1
 	done
 
 	# Must force the slaves to a particular state before adding them
-	for s in "${!slaves}" ; do
+	for s in ${!slaves} ; do
 		interface_del_addresses "${s}"
 		interface_up "${s}"
 	done
@@ -70,7 +70,7 @@ bonding_pre_start() {
 
 	# finally add in slaves
 	eoutdent
-	/sbin/ifenslave "${iface}" "${!slaves}" >/dev/null
+	eval /sbin/ifenslave "${iface}" "${!slaves}" >/dev/null
 	eend $?
 
 	return 0 #important
@@ -95,7 +95,7 @@ bonding_stop() {
 	eindent
 	einfo "${slaves}"
 	eoutdent
-	/sbin/ifenslave -d "${iface}" ${slaves} &>${devnull}
+	/sbin/ifenslave -d "${iface}" ${slaves}
 
 	# reset all slaves
 	for s in ${slaves}; do
diff --git a/net-scripts/net.modules.d/iwconfig b/net-scripts/net.modules.d/iwconfig
index 232cf0a..98c929e 100644
--- a/net-scripts/net.modules.d/iwconfig
+++ b/net-scripts/net.modules.d/iwconfig
@@ -244,7 +244,7 @@ iwconfig_setup_specific() {
 # 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 mac="$( iwconfig_get_ap_mac_address $1 )" i
 	local -a invalid_macs=(
 		"00:00:00:00:00:00"
 		"44:44:44:44:44:44"
@@ -340,7 +340,8 @@ iwconfig_associate() {
 		ESSIDVAR=$( bash_variable "${ESSID}" )
 		key=$( iwconfig_get_wep_key "${mac}" )
 		if [[ ${wep_required} == "on" && ${key} == "off" ]]; then
-			ewarn "WEP key is not set for \"${dessid}\""
+			eerror "WEP key is not set for \"${dessid}\" - not connecting"
+			return 1
 		fi
 		if [[ ${wep_required} == "off" && ${key} != "off" ]]; then
 			key="off"
@@ -429,7 +430,7 @@ iwconfig_scan() {
 	fi
 
 	# Set the essid to any. This is required for scanning
-	iwconfig "${iface}" essid any
+	#iwconfig "${iface}" essid any
 
 	veinfo "Scanning for access points"
 
diff --git a/net-scripts/net.modules.d/wpa_supplicant b/net-scripts/net.modules.d/wpa_supplicant
index 8458c0f..4f621d1 100644
--- a/net-scripts/net.modules.d/wpa_supplicant
+++ b/net-scripts/net.modules.d/wpa_supplicant
@@ -208,7 +208,7 @@ wpa_supplicant_pre_start() {
 	opts="wpa_supplicant_${ifvar}"
 	opts=" ${!opts} "
 	[[ ${opts} != *" -D"* ]] \
-		&& ewarn "wpa_supplicant_${ifvar} does not define a driver"
+		&& vewarn "wpa_supplicant_${ifvar} does not define a driver"
 	
 	# We only work on wirelesss interfaces unless a driver for wired
 	# has been defined