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

[qboosh]

Author: qboosh
Date: Mon Feb  8 18:34:39 2010
New Revision: 11137

Modified:
   rc-scripts/trunk/sysconfig/interfaces/ifcfg-description
   rc-scripts/trunk/sysconfig/network-scripts/ifup
Log:
- WLAN_WPA_DRIVER should default to wext

Modified: rc-scripts/trunk/sysconfig/interfaces/ifcfg-description
==============================================================================
--- rc-scripts/trunk/sysconfig/interfaces/ifcfg-description	(original)
+++ rc-scripts/trunk/sysconfig/interfaces/ifcfg-description	Mon Feb  8 18:34:39 2010
@@ -121,7 +121,7 @@
 		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_DRIVER=<driver: see -D option of wpa_supplicant; default is wext>
 			WLAN_WPA_CONFIG=<path to wpa_supplicant config file>
 			WLAN_WPA_OPTIONS=[additional wpa_supplicant options]
 		fi

Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup	Mon Feb  8 18:34:39 2010
@@ -123,7 +123,7 @@
 fi
 
 if is_yes "${WLAN_WPA}"; then
-	/usr/sbin/wpa_supplicant -D ${WLAN_WPA_DRIVER} -c ${WLAN_WPA_CONFIG:-/etc/wpa_supplicant.conf} -i ${DEVICE} ${WLAN_WPA_OPTIONS} -P "/var/run/wpa_supplicant-${DEVICE}.pid" -B
+	/usr/sbin/wpa_supplicant -D ${WLAN_WPA_DRIVER:-wext} -c ${WLAN_WPA_CONFIG:-/etc/wpa_supplicant.conf} -i ${DEVICE} ${WLAN_WPA_OPTIONS} -P "/var/run/wpa_supplicant-${DEVICE}.pid" -B
 fi
 
 if [ "$HANDLING" = "2" ]; then