[pkg-wpa-devel] Bug#633040: Bug#633040: wpasupplicant: /run transition: Please switch to /run/sendsigs.omit.d

[Kel Modderman]

Hi Roger,

On Fri, 8 Jul 2011 08:39:53 AM Roger Leigh wrote:
> Source: wpasupplicant
> Version: 0.7.3-3
> Severity: important
> 
> Your package is currently using/lib/init/rw/sendsigs.omit.d
> which is now deprecated and pending removal.  Please update your
> package to use /run/sendsigs.omit.d with a versioned dependency
> on initscripts, as detailed below.
> 
> An overview of the /run transition and its current progress is
> available at http://wiki.debian.org/ReleaseGoals/RunDirectory
> Basically, it's now in both testing and unstable, and the next
> phase of the transition is to migrate all users of /lib/init/rw
> over to /run and then remove /lib/init/rw entirely for wheezy
> (as soon as this transition is complete).
> 
> Your package is one of the users of sendsigs.omit.d listed here:
> http://wiki.debian.org/ReleaseGoals/RunDirectory#Packages_using_.2BAC8-lib.
> 2BAC8-init.2BAC8-rw
> 
> Recommendations for how to do the transition may be found here:
> http://wiki.debian.org/ReleaseGoals/RunDirectory#How_to_transition_from_.2B
> AC8-lib.2BAC8-init.2BAC8-rw_to_.2BAC8-run.3F
> 
> For sendsigs.omit.d, we would recommend that you:
> 
> * Depend on initscripts (>= 2.88dsf-13.3)

Is it really neccessary in this case?

> * Replace *all* usage of /lib/init/rw with /run

I was hoping just to support (with first preference) the new location in
addition to the previous locations, then remove that code sometime in next
release cycle.

> * Move all files in /lib/init/rw to /run in the package postinst, for
>   example:
> 
>     if [ -f /lib/init/rw/sendsigs.omit.d/foo ]; then
>         mv /lib/init/rw/sendsigs.omit.d/foo /run/sendsigs.omit.d/foo
>     fi

Attached patch.

Thanks, Kel.
---
Index: debian/ifupdown/functions.sh
===================================================================
--- debian/ifupdown/functions.sh	(revision 1586)
+++ debian/ifupdown/functions.sh	(working copy)
@@ -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=
Index: debian/wpasupplicant.postinst
===================================================================
--- debian/wpasupplicant.postinst	(revision 1586)
+++ debian/wpasupplicant.postinst	(working copy)
@@ -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)
 		;;
---