SVN: rc-scripts/trunk/sysconfig/network-scripts: ifdown ifup

[undefine]

Author: undefine
Date: Sun Oct 26 00:53:23 2008
New Revision: 9921

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/ifdown
   rc-scripts/trunk/sysconfig/network-scripts/ifup
Log:
- wpa is also usefull with not wireless devices - eg with 8021x.
- patch by Pawel Nogas <pnogas(AT)amu(DOT)edu(DOT)pl>


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 26 00:53:23 2008
@@ -99,11 +99,9 @@
 	fi
 fi
 
-if is_wireless_device "${DEVICE}"; then
-	if is_yes "${WLAN_WPA}"; then
-		killproc --pidfile "wpa_supplicant-${DEVICE}.pid" wpa_supplicant > /dev/null 2>&1
-		rm -f "/var/run/wpa_supplicant-${DEVICE}.pid"
-	fi
+if is_yes "${WLAN_WPA}"; then
+	killproc --pidfile "wpa_supplicant-${DEVICE}.pid" wpa_supplicant > /dev/null 2>&1
+	rm -f "/var/run/wpa_supplicant-${DEVICE}.pid"
 fi
 
 # Check to make sure the device is actually up

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 26 00:53:23 2008
@@ -113,9 +113,10 @@
 if is_wireless_device "${DEVICE}"; then
 	is_yes "${WLAN_UPEARLY}" && ip link set ${DEVICE} up
 	wireless_param ${DEVICE}
-	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
-	fi
+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
 fi
 
 if [ "$HANDLING" = "2" ]; then