- wpa is also usefull with not wireless devices - eg with 8021x.

- patch by Pawel Nogas <pnogas(AT)amu(DOT)edu(DOT)pl>

svn-id: @9921

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 67f3fabfaefae08eb7b72e5a52f1e0250f32cf30..61038acf7d493df4ab955bc796297aa2ef86d859 100755 (executable)
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -99,11 +99,9 @@ if [ -n "$BOOTPROTO" -a "$BOOTPROTO" != "none" -a "$BOOTPROTO" != "static" ]; th
        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

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index ac003611eae40f71552d52e6eca3c8ad06bcf0d6..6408b9bee546d4a67b83bc1b58bb2c10789ca31d 100755 (executable)
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -113,9 +113,10 @@ fi
 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