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

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

Author: kelmo-guest
Date: Mon Sep 22 20:01:28 2008
New Revision: 1249

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1249
Log:
* DO NOT RELEASE.
* Install /etc/wpa_supplicant/action_wpa.sh to enhance wpa-roam integration
  with pm-utils and ifplugd.

Added:
    wpasupplicant/trunk/debian/ifupdown/action_wpa.sh
Modified:
    wpasupplicant/trunk/debian/changelog
    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=1249&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Mon Sep 22 20:01:28 2008
@@ -1,3 +1,11 @@
+wpasupplicant (0.6.4-3) unstable; urgency=low
+
+  * DO NOT RELEASE.
+  * Install /etc/wpa_supplicant/action_wpa.sh to enhance wpa-roam integration
+    with pm-utils and ifplugd.
+
+ -- Kel Modderman <kel at otaku42.de>  Tue, 23 Sep 2008 06:00:22 +1000
+
 wpasupplicant (0.6.4-2) unstable; urgency=low
 
   * Bugfix: wpasupplicant crashes (closes: #485769). Patch taken from

Added: wpasupplicant/trunk/debian/ifupdown/action_wpa.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/action_wpa.sh?rev=1249&op=file
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/action_wpa.sh (added)
+++ wpasupplicant/trunk/debian/ifupdown/action_wpa.sh Mon Sep 22 20:01:28 2008
@@ -1,0 +1,78 @@
+#!/bin/sh
+
+# Action script to enable/disable wpa-roam interfaces in reaction to
+# pm-action or ifplugd events.
+#
+# Copyright: Copyright (c) 2008, Kel Modderman <kel at otaku42.de>
+# License:   GPL-2
+#
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+if [ ! -x /sbin/wpa_action ]; then
+	exit 0
+fi
+
+SELF=action_wpa
+COMMAND=
+IFPLUGD_IFACE=
+
+if [ "$#" -eq 2 ]; 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}: uknown ifplugd arguments: ${@}" >&2
+			exit 1
+			;;
+	esac
+elif [ "$#" -eq 1 ]; then
+	# pm-action(8) - <action>
+	#
+	# On suspend|hibernate, disconnect any wpa-roam managed interfaces,
+	# reconnect it on resume.
+
+	case "${1}" in
+		suspend|hibernate)
+			COMMAND=disconnect
+			;;
+		resume|thaw)
+			COMMAND=reconnect
+			;;
+		*)
+			echo "${SELF}: uknown pm-action arguments: ${@}" >&2
+			exit 1
+			;;
+	esac
+else
+	echo "${SELF}: unknow 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
+		continue
+	fi
+
+	wpa_cli -i "${IFACE}" "${COMMAND}"
+done

Modified: wpasupplicant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/rules?rev=1249&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/rules (original)
+++ wpasupplicant/trunk/debian/rules Mon Sep 22 20:01:28 2008
@@ -69,6 +69,8 @@
 		debian/wpasupplicant/etc/wpa_supplicant/ifupdown.sh
 	install --mode=755 -D debian/ifupdown/functions.sh \
 		debian/wpasupplicant/etc/wpa_supplicant/functions.sh
+	install --mode=755 -D debian/ifupdown/action_wpa.sh \
+		debian/wpasupplicant/etc/wpa_supplicant/action_wpa.sh
 	
 	# wpa_action
 	install --mode=755 -D debian/ifupdown/wpa_action.sh \

Modified: wpasupplicant/trunk/debian/wpasupplicant.links
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.links?rev=1249&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.links (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.links Mon Sep 22 20:01:28 2008
@@ -2,4 +2,6 @@
 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 etc/pm/sleep.d/action_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