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

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

Author: kelmo-guest
Date: Wed Jul  2 10:43:20 2008
New Revision: 1210

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1210
Log:
ifupdown.sh: exit without message or error when ifupdown_locked() is true, otherwise spit out a hint to the admin

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

Modified: wpasupplicant/trunk/debian/ifupdown/ifupdown.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/ifupdown.sh?rev=1210&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/ifupdown.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/ifupdown.sh Wed Jul  2 10:43:20 2008
@@ -59,10 +59,14 @@
 
 do_start () {
 	if test_wpa_cli; then
-		# if wpa_action is active for this IFACE, do nothing
-		wpa_msg stderr "wpa_action is managing ifup/ifdown state of $WPA_IFACE"
-		wpa_msg stderr "execute \`ifdown --force $WPA_IFACE' to stop wpa_action"
-		exit 0
+		if ifupdown_locked; then
+			exit 0
+		else
+			# if wpa_action is active for this IFACE, do nothing
+			wpa_msg stderr "wpa_action is managing ifup/ifdown state of $WPA_IFACE"
+			wpa_msg stderr "execute \`ifdown --force $WPA_IFACE' to stop wpa_action"
+			exit 1
+		fi
 	elif ! set | grep --quiet "^IF_WPA"; then
 		# no wpa- option defined for IFACE, do nothing
 		exit 0