[pkg-wpa-devel] r1590 - in /wpasupplicant/trunk/debian: changelog control ifupdown/functions.sh wpasupplicant.postinst

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Sun Jul 24 09:18:28 UTC 2011 

Author: kelmo-guest
Date: Sun Jul 24 09:18:27 2011
New Revision: 1590

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1590
Log:
  - depend on initscripts (>= 2.88dsf-13.3)
  - create new omission pid files in /run/sendsigs.omit.d/ unconditionally
  - migrate existing omission pid files from /lib/init/rw/ to
    /run/sendsigs.omit.d/

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/control
    wpasupplicant/trunk/debian/ifupdown/functions.sh
    wpasupplicant/trunk/debian/wpasupplicant.postinst

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1590&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Jul 24 09:18:27 2011
@@ -5,11 +5,12 @@
 
   [ Kel Modderman ]
   * Support /run/sendsigs.omit.d/:
-    - create new omission pid files in /run/sendsigs.omit.d/ if it exists
-    - migrate existing omission pid files from old locations to
-      /run/sendsigs.omit.d/ if it exists at upgrade time
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 24 Jul 2011 18:19:42 +1000
+    - depend on initscripts (>= 2.88dsf-13.3)
+    - create new omission pid files in /run/sendsigs.omit.d/ unconditionally
+    - migrate existing omission pid files from /lib/init/rw/ to
+      /run/sendsigs.omit.d/
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 24 Jul 2011 19:17:15 +1000
 
 wpasupplicant (0.7.3-3) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=1590&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Sun Jul 24 09:18:27 2011
@@ -24,7 +24,7 @@
 
 Package: wpasupplicant
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), adduser, initscripts (>= 2.88dsf-13.3)
 Suggests: wpagui, libengine-pkcs11-openssl
 Description: client support for WPA and WPA2 (IEEE 802.11i)
  WPA and WPA2 are methods for securing wireless networks, the former

Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1590&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Sun Jul 24 09:18:27 2011
@@ -32,6 +32,7 @@
 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="/run/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
 
 # wpa_cli variables
 WPA_CLI_BIN="/sbin/wpa_cli"
@@ -39,19 +40,6 @@
 WPA_CLI_PIDFILE="/var/run/wpa_action.${WPA_IFACE}.pid"
 WPA_CLI_TIMESTAMP="/var/run/wpa_action.${WPA_IFACE}.timestamp"
 WPA_CLI_IFUPDOWN="/var/run/wpa_action.${WPA_IFACE}.ifupdown"
-
-if [ -d /run/sendsigs.omit.d/ ]; then
-	# Debian, initscripts (>= 2.88dsf-13.3)
-	WPA_SUP_OMIT_PIDFILE="/run/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
-elif [ -d /lib/init/rw/sendsigs.omit.d/ ]; then
-	# Debian, initscripts (< 2.88dsf-13.3)
-	WPA_SUP_OMIT_PIDFILE="/lib/init/rw/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
-elif [ -d /var/run/sendsigs.omit.d/ ]; then
-	# Ubuntu (< "oneiric")
-	WPA_SUP_OMIT_PIDFILE="/var/run/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
-else
-	WPA_SUP_OMIT_PIDFILE=
-fi
 
 # default ctrl_interface socket directory
 if [ -z "$WPA_CTRL_DIR" ]; then
@@ -281,28 +269,24 @@
 		return 1
 	fi
 
-	if [ -n "$WPA_SUP_OMIT_PIDFILE" ]; then
-		local WPA_PIDFILE_WAIT
-		local MAX_WPA_PIDFILE_WAIT
-		WPA_PIDFILE_WAIT="0"
-		MAX_WPA_PIDFILE_WAIT="5"
-		until [ -s "$WPA_SUP_PIDFILE" ]; do
-			if [ "$WPA_PIDFILE_WAIT" -ge "$MAX_WPA_PIDFILE_WAIT" ]; then
-				wpa_msg stderr "timed out waiting for creation of $WPA_SUP_PIDFILE"
-				return 1
-			else
-				wpa_msg verbose "waiting for \"$WPA_SUP_PIDFILE\": " \
-					"$WPA_PIDFILE_WAIT (max. $MAX_WPA_PIDFILE_WAIT)"
-			fi
-
-			WPA_PIDFILE_WAIT=$(($WPA_PIDFILE_WAIT + 1))
-			sleep 1
-		done
-		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
+	local WPA_PIDFILE_WAIT
+	local MAX_WPA_PIDFILE_WAIT
+	WPA_PIDFILE_WAIT="0"
+	MAX_WPA_PIDFILE_WAIT="5"
+	until [ -s "$WPA_SUP_PIDFILE" ]; do
+		if [ "$WPA_PIDFILE_WAIT" -ge "$MAX_WPA_PIDFILE_WAIT" ]; then
+			wpa_msg stderr "timed out waiting for creation of $WPA_SUP_PIDFILE"
+			return 1
+		else
+			wpa_msg verbose "waiting for \"$WPA_SUP_PIDFILE\": " \
+				"$WPA_PIDFILE_WAIT (max. $MAX_WPA_PIDFILE_WAIT)"
+		fi
+
+		WPA_PIDFILE_WAIT=$(($WPA_PIDFILE_WAIT + 1))
+		sleep 1
+	done
+	wpa_msg verbose "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
+	cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
 
 	local WPA_SOCKET_WAIT
 	local MAX_WPA_SOCKET_WAIT

Modified: wpasupplicant/trunk/debian/wpasupplicant.postinst
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.postinst?rev=1590&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.postinst (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.postinst Sun Jul 24 09:18:27 2011
@@ -24,17 +24,11 @@
 			addgroup --quiet --system netdev || true
 		fi
 
-		# Migrate sendsigs pid ommission files to /run
-		if [ -d /run/sendsigs.omit.d ]; then
-			for omitd in /lib/init/rw/sendsigs.omit.d \
-			    /var/run/sendsigs.omit.d
+		# Migrate existing sendsigs omission pid files to /run
+		if [ -d /run/sendsigs.omit.d/ ] && [ -d /lib/init/rw/ ]; then
+			for f in /lib/init/rw/wpasupplicant.*.pid
 			do
-				if [ -d "$omitd" ]; then
-					for f in ${omitd}/wpasupplicant.*.pid
-					do
-						mv "$f" /run/sendsigs.omit.d/
-					done
-				fi
+				mv "$f" /run/sendsigs.omit.d/
 			done
 		fi
 		;;

More information about the Pkg-wpa-devel mailing list