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

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

Author: kelmo-guest
Date: Sun Jul 24 08:19:58 2011
New Revision: 1587

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1587
Log:
* 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

Modified:
    wpasupplicant/trunk/debian/changelog
    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=1587&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Jul 24 08:19:58 2011
@@ -1,9 +1,15 @@
 wpasupplicant (0.7.3-4) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  [ Stefan Lippers-Hollmann ]
   * bump standards version to 3.9.2, no changes necessary.
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Fri, 22 Apr 2011 15:08:16 +0200
+  [ 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
 
 wpasupplicant (0.7.3-3) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1587&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Sun Jul 24 08:19:58 2011
@@ -40,12 +40,14 @@
 WPA_CLI_TIMESTAMP="/var/run/wpa_action.${WPA_IFACE}.timestamp"
 WPA_CLI_IFUPDOWN="/var/run/wpa_action.${WPA_IFACE}.ifupdown"
 
-# sendsigs omission interface, present in initscripts (>= 2.86.ds1-48)
-if [ -d /lib/init/rw/sendsigs.omit.d/ ]; then
-	# Debian
+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, see https://launchpad.net/bugs/181541 for status
+	# Ubuntu (< "oneiric")
 	WPA_SUP_OMIT_PIDFILE="/var/run/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
 else
 	WPA_SUP_OMIT_PIDFILE=

Modified: wpasupplicant/trunk/debian/wpasupplicant.postinst
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.postinst?rev=1587&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.postinst (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.postinst Sun Jul 24 08:19:58 2011
@@ -23,6 +23,20 @@
 		if ! getent group netdev >/dev/null; then
 			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
+			do
+				if [ -d "$omitd" ]; then
+					for f in ${omitd}/wpasupplicant.*.pid
+					do
+						mv "$f" /run/sendsigs.omit.d/
+					done
+				fi
+			done
+		fi
 		;;
 	abort-upgrade|abort-deconfigure|abort-remove)
 		;;