rc-scripts/trunk/sysconfig: interfaces/ifcfg-description network-scripts/ifdown network-scripts/ifup

[arekm]

Author: arekm
Date: Sun Oct  2 19:13:12 2005
New Revision: 6420

Modified:
   rc-scripts/trunk/sysconfig/interfaces/ifcfg-description
   rc-scripts/trunk/sysconfig/network-scripts/ifdown
   rc-scripts/trunk/sysconfig/network-scripts/ifup
Log:
Simple support for WPA. Note that killing wpa_supplicant daemon is supported only for single daemon/interface (TODO: multiple daemons support).


Modified: rc-scripts/trunk/sysconfig/interfaces/ifcfg-description
==============================================================================
--- rc-scripts/trunk/sysconfig/interfaces/ifcfg-description	(original)
+++ rc-scripts/trunk/sysconfig/interfaces/ifcfg-description	Sun Oct  2 19:13:12 2005
@@ -101,6 +101,11 @@
 		WLAN_TXPOWER=<power in dBm>|<power in mW>mW|auto|on|off
 		WLAN_RETRY=limit <value>|lifetime <value>
 		WLAN_COMMIT=yes|no (some cards require manual commit of changes)
+		if WLAN_WPA=yes; then
+			WLAN_WPA_DRIVER=<driver; see -D option of wpa_supplicant>
+			WLAN_WPA_CONFIG=<path to wpa_supplicant config file>
+			WLAN_WPA_OPTIONS=[additional wpa_supplicant options]
+		fi
 	fi
 	
 elif	DEVICE=ppp* || DEVICE=sl* ; then

Modified: rc-scripts/trunk/sysconfig/network-scripts/ifdown
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifdown	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifdown	Sun Oct  2 19:13:12 2005
@@ -89,6 +89,13 @@
     sleep 1
 fi
 
+if is_wireless_device "${DEVICE}"; then
+    if is_yes "${WLAN_WPA}"; then
+	killall wpa_supplicant
+	rm -f /var/run/wpa_supplicant
+    fi
+fi
+    
 vlan_setup
 if is_yes $ETH_VLANS && `echo $DEVICE | grep -q ^eth` ; then
     if echo "${DEVICE}" | grep -q '\.' ; then

Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup	Sun Oct  2 19:13:12 2005
@@ -105,6 +105,9 @@
 
 if is_wireless_device "${DEVICE}"; then
     wireless_param ${DEVICE}
+    if is_yes "${WLAN_WPA}"; then
+	/usr/sbin/wpa_supplicant -B -w -D ${WLAN_WPA_DRIVER} -c ${WLAN_WPA_CONFIG} -i ${DEVICE} ${WLAN_WPA_OPTIONS}
+    fi
 fi
 	
 if [ "$HANDLING" = "2" ]; then