[pkg-wpa-devel] r1534 - in /wpasupplicant/trunk/debian: changelog ifupdown/action_wpa.sh rules wpasupplicant.links

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Sun May 2 00:56:43 UTC 2010


Author: kelmo-guest
Date: Sun May  2 00:56:42 2010
New Revision: 1534

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1534
Log:
* Install pm-utils action script to notify wpa_supplicant of susepnd
  and resume events.
* Remove pm-utils stuff from debian/ifupdown/action_wpa.sh.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/ifupdown/action_wpa.sh
    wpasupplicant/trunk/debian/rules
    wpasupplicant/trunk/debian/wpasupplicant.links

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1534&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun May  2 00:56:42 2010
@@ -24,8 +24,11 @@
     qt4's string comparison of 'Select any network' with regular
     expression matching of '^\d+:' for functions which need to get the
     network id number.
-
- -- Kel Modderman <kel at otaku42.de>  Sat, 01 May 2010 18:23:42 +1000
+  * Install pm-utils action script to notify wpa_supplicant of susepnd
+    and resume events.
+  * Remove pm-utils stuff from debian/ifupdown/action_wpa.sh.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 02 May 2010 10:54:24 +1000
 
 wpasupplicant (0.6.10-2) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/ifupdown/action_wpa.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/action_wpa.sh?rev=1534&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/action_wpa.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/action_wpa.sh Sun May  2 00:56:42 2010
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # Action script to enable/disable wpa-roam interfaces in reaction to
-# pm-action or ifplugd events.
+# ifplugd events.
 #
-# Copyright: Copyright (c) 2008-2009, Kel Modderman <kel at otaku42.de>
+# Copyright: Copyright (c) 2008-2010, Kel Modderman <kel at otaku42.de>
 # License:   GPL-2
 #
 
@@ -13,69 +13,38 @@
 	exit 0
 fi
 
-SELF=action_wpa
-COMMAND=
-IFPLUGD_IFACE=
+# ifplugd(8) - <iface> <action>
+#
+# If an ifplugd managed interface is brought up, disconnect any
+# wpa-roam managed interfaces so that only one "roaming" interface
+# remains active on the system.
 
-# pm-action(8) - <action> <suspend method>
-#
-# On suspend|hibernate, disconnect any wpa-roam managed interfaces,
-# reconnect it on resume|thaw.
-#
-# The help action must be supported (but can be no-op).
+IFPLUGD_IFACE="${1}"
 
-case "${1}" in
-        suspend|hibernate)
-                COMMAND=disconnect
-                ;;
-        resume|thaw)
-                COMMAND=reconnect
-                ;;
-	help)
-		exit 0
+case "${2}" in
+	up)
+		COMMAND=disconnect
+		;;
+	down)
+		COMMAND=reconnect
+		;;
+	*)
+		echo "$0: unknown arguments: ${@}" >&2
+		exit 1
 		;;
 esac
-
-if [ -z "$COMMAND" ]; then
-	# ifplugd(8) - <iface> <action>
-	#
-	# If an ifplugd managed interface is brought up, disconnect any
-	# wpa-roam managed interfaces so that only one "roaming" interface
-	# remains active on the system.
-
-	IFPLUGD_IFACE="${1}"
-
-	case "${2}" in
-		up)
-			COMMAND=disconnect
-			;;
-		down)
-			COMMAND=reconnect
-			;;
-		*)
-			echo "${SELF}: unknown $0 arguments: ${@}" >&2
-			exit 1
-			;;
-        esac
-fi
-
-if [ -z "$COMMAND" ]; then
-	echo "${SELF}: unknown arguments: ${@}" >&2
-	exit 1
-fi
 
 for CTRL in /var/run/wpa_supplicant/*; do
 	[ -S "${CTRL}" ] || continue
 
 	IFACE="${CTRL#/var/run/wpa_supplicant/}"
 
-	wpa_action "${IFACE}" check || continue
-
-	if [ "${IFPLUGD_IFACE}" ] && [ "${IFPLUGD_IFACE}" = "${IFACE}" ]; then
-		# if ifplugd is managing this interface (not likely but..)
-		# do nothing
+	# skip if ifplugd is managing this interface
+	if [ "${IFPLUGD_IFACE}" = "${IFACE}" ]; then
 		continue
 	fi
 
-	wpa_cli -i "${IFACE}" "${COMMAND}"
+	if wpa_action "${IFACE}" check; then
+		wpa_cli -i "${IFACE}" "${COMMAND}"
+	fi
 done

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=1534&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Sun May  2 00:56:42 2010
@@ -59,6 +59,8 @@
 		debian/wpasupplicant/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
 	install --mode=644 -D wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service \
 		debian/wpasupplicant/usr/share/dbus-1/system-services/fi.w1.wpa_supplicant1.service
+	install --mode=755 -D wpa_supplicant/examples/60_wpa_supplicant \
+		debian/wpasupplicant/usr/lib/pm-utils/sleep.d/60_wpa_supplicant
 
 override_dh_installchangelogs:
 	dh_installchangelogs wpa_supplicant/ChangeLog

Modified: wpasupplicant/trunk/debian/wpasupplicant.links
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.links?rev=1534&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.links (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.links Sun May  2 00:56:42 2010
@@ -2,6 +2,5 @@
 etc/wpa_supplicant/ifupdown.sh etc/network/if-up.d/wpasupplicant
 etc/wpa_supplicant/ifupdown.sh etc/network/if-down.d/wpasupplicant
 etc/wpa_supplicant/ifupdown.sh etc/network/if-post-down.d/wpasupplicant
-etc/wpa_supplicant/action_wpa.sh usr/lib/pm-utils/sleep.d/70action_wpa
 etc/wpa_supplicant/action_wpa.sh etc/ifplugd/action.d/action_wpa
 usr/share/doc/wpasupplicant/README.Debian usr/share/doc/wpasupplicant/README.modes




More information about the Pkg-wpa-devel mailing list