--- trunk/magellan-initscripts/etc/rc.d/init.d/network	2008/12/22 22:01:15	781
+++ trunk/magellan-initscripts/etc/rc.d/init.d/network	2009/05/09 16:08:38	867
@@ -195,9 +195,16 @@
 		# write default cfg from skeleton
 		cat ${WIRELESS_WPA_SKEL} > ${WIRELESS_WPA_CONFIG}
 
+		local wpa_proto
+		case ${WIRELESS_AUTH_MODE} in
+			wpa) wpa_proto="WPA" ;;
+			wpa2) wpa_proto="WPA2" ;;
+		esac
+
 		# setup the network entry
 		sed -i -e "s:@WIRELESS_ESSID@:${WIRELESS_ESSID}:g" \
-			-e "s:@WIRELESS_KEY@:${WIRELESS_KEY}:g" \
+			-e "s:@WIRELESS_KEY@:${WIRELESS_KEY_ASCII}:g" \
+			-e "s:@WIRELESS_AUTH_MODE@:${wpa_proto}:g" \
 			${WIRELESS_WPA_CONFIG}
 	fi
 
@@ -245,9 +252,9 @@
 	[[ -n ${WIRELESS_NICK} ]] && iwconfig "${iface}" nick "${WIRELESS_NICK}"
 
 	case "${WIRELESS_AUTH_MODE}" in
-		wpa)	config_wireless_wpa "${iface}" ;;
-		wep|on)	config_wireless_wep "${iface}" ;;
-		off)	iwconfig "${iface}" enc off ;;
+		wpa|wpa2) config_wireless_wpa "${iface}" ;;
+		wep|on) config_wireless_wep "${iface}" ;;
+		off) iwconfig "${iface}" enc off ;;
 	esac
 }