[pkg-wpa-devel] r1012 - /wpasupplicant/trunk/debian/ifupdown/wpa_action.sh

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Tue Jan  8 09:12:02 2008
New Revision: 1012

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1012
Log:
adjust wpa_action to behave better now that ifupdown hook more properly kills wpa_su0pplicant process on ifdown

Modified:
    wpasupplicant/trunk/debian/ifupdown/wpa_action.sh

Modified: wpasupplicant/trunk/debian/ifupdown/wpa_action.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/wpa_action.sh?rev=1012&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/wpa_action.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/wpa_action.sh Tue Jan  8 09:12:02 2008
@@ -42,7 +42,8 @@
 		wpa_hysteresis_check || exit 1
 		wpa_log_action
 		wpa_log_environment
-		ifupdown_check && ifup
+		ifupdown_check || exit 1
+		ifup
 		wpa_hysteresis_event
 		wpa_cli status
 		ifupdown_status || wpa_cli reassociate
@@ -53,17 +54,15 @@
 		wpa_hysteresis_check || exit 1
 		wpa_log_action
 		wpa_log_environment
-		if ifupdown_check; then
-			ifdown
-			if_post_down_up
-		fi
+		ifupdown_check || exit 1
+		ifdown
+		if_post_down_up
 		;;
 
 	"stop"|"down")
-		test_wpa_supplicant || exit 1
-		kill_wpa_cli
-		ifupdown_check && ifdown
-		kill_wpa_supplicant
+		test_wpa_cli && kill_wpa_cli
+		ifupdown_check || exit 1
+		ifdown
 		wpa_log_init
 		wpa_log_action
 		;;