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

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

Author: kelmo-guest
Date: Sun Jan  6 11:02:17 2008
New Revision: 1002

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1002
Log:
modify handling of WPA_{CLI,SUP}_OMIT_PIDFILE creation

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

Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1002&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Sun Jan  6 11:02:17 2008
@@ -32,16 +32,22 @@
 WPA_SUP_BIN="/sbin/wpa_supplicant"
 WPA_SUP_PNAME="wpa_supplicant"
 WPA_SUP_PIDFILE="/var/run/wpa_supplicant.${WPA_IFACE}.pid"
-WPA_SUP_OMIT_PIDFILE="/lib/init/rw/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
 WPA_SUP_LOGFILE="/var/log/wpa_supplicant.${WPA_IFACE}.log"
 
 # wpa_cli variables
 WPA_CLI_BIN="/sbin/wpa_cli"
 WPA_CLI_PNAME="wpa_cli"
 WPA_CLI_PIDFILE="/var/run/wpa_action.${WPA_IFACE}.pid"
-WPA_CLI_OMIT_PIDFILE="/lib/init/rw/sendsigs.omit.d/wpasupplicant.wpa_action.${WPA_IFACE}.pid"
 WPA_CLI_LOGFILE="/var/log/wpa_action.${WPA_IFACE}.log"
 WPA_CLI_TIMESTAMP="/var/run/wpa_action.${WPA_IFACE}.timestamp"
+
+# sendsigs omission interface, present in initscripts (>= 2.86.ds1-48)
+# previously, we used an initscript to ifdown interfaces before sendsigs
+# terminated wpa_supplicant/wpa_cli processes - that was an ugly hack
+if [ -d /lib/init/rw/sendsigs.omit.d/ ]; then
+	WPA_SUP_OMIT_PIDFILE="/lib/init/rw/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
+	WPA_CLI_OMIT_PIDFILE="/lib/init/rw/sendsigs.omit.d/wpasupplicant.wpa_action.${WPA_IFACE}.pid"
+fi
 
 # default ctrl_interface socket directory
 if [ -z "$WPA_CTRL_DIR" ]; then
@@ -251,9 +257,11 @@
 		fi
 
 		if [ -s "$WPA_SUP_PIDFILE" ]; then
-			if [ -d /lib/init/rw/sendsigs.omit.d/ ]; then
+			if [ -n "$WPA_SUP_OMIT_PIDFILE" ]; then
 				wpa_msg verbose "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
 				cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
+			else
+				wpa_msg verbose "sendsigs omission pidfile not created"
 			fi
 		else
 			wpa_msg stderr "pidfile missing or empty: $WPA_SUP_PIDFILE"
@@ -346,9 +354,11 @@
 		fi
 
 		if [ -s "$WPA_CLI_PIDFILE" ]; then
-			if [ -d /lib/init/rw/sendsigs.omit.d/ ]; then
+			if [ -n "$WPA_CLI_OMIT_PIDFILE" ]; then
 				wpa_msg verbose "creating sendsigs omission pidfile: $WPA_CLI_OMIT_PIDFILE"
 				cat "$WPA_CLI_PIDFILE" > "$WPA_CLI_OMIT_PIDFILE"
+			else
+				wpa_msg verbose "sendsigs omission file not created"
 			fi
 		else
 			wpa_msg stderr "empty or missing: $WPA_CLI_PIDFILE"