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

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

Author: kelmo-guest
Date: Wed Jul  2 11:07:20 2008
New Revision: 1211

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1211
Log:
ifupdown.sh: only spit out message during pre-up phase, to avoid duplicity

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=1211&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/ifupdown.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/ifupdown.sh Wed Jul  2 11:07:20 2008
@@ -59,14 +59,17 @@
 
 do_start () {
 	if test_wpa_cli; then
+		# if wpa_action is active for this IFACE, do nothing
 		if ifupdown_locked; then
 			exit 0
-		else
-			# if wpa_action is active for this IFACE, do nothing
+		fi
+
+		# if the administrator is calling ifup, say something useful
+		if [ "$PHASE" = "pre-up" ]; then
 			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
+		exit 1
 	elif ! set | grep --quiet "^IF_WPA"; then
 		# no wpa- option defined for IFACE, do nothing
 		exit 0