[pkg-wpa-devel] r1020 - in /wpasupplicant/trunk: ./ debian/ifupdown/functions.sh debian/wpasupplicant.wpa-ifupdown.init

[siretart at users.alioth.debian.org]

Author: siretart
Date: Wed Jan  9 17:19:29 2008
New Revision: 1020

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1020
Log:
enable ommission pid file support for ubuntu, add pointer to corresponding launchpad bug

Modified:
    wpasupplicant/trunk/   (props changed)
    wpasupplicant/trunk/debian/ifupdown/functions.sh
    wpasupplicant/trunk/debian/wpasupplicant.wpa-ifupdown.init

Propchange: wpasupplicant/trunk/
------------------------------------------------------------------------------
    bzr:file-ids = 

Propchange: wpasupplicant/trunk/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-trunk1 (added)
+++ bzr:revision-id:v3-trunk1 Wed Jan  9 17:19:29 2008
@@ -1,0 +1,1 @@
+138 siretart at tauware.de-20080109171911-xgx0s53g6ume0agv

Propchange: wpasupplicant/trunk/
------------------------------------------------------------------------------
--- bzr:revision-info (added)
+++ bzr:revision-info Wed Jan  9 17:19:29 2008
@@ -1,0 +1,4 @@
+timestamp: 2008-01-09 18:19:11.976000071 +0100
+committer: Reinhard Tartler <siretart at tauware.de>
+properties: 
+	branch-nick: wpasupplicant.trunk.bzr

Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1020&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Wed Jan  9 17:19:29 2008
@@ -46,10 +46,10 @@
 	# Debian
 	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"
-#elif [ -d /var/run/sendsigs.omit.d/ ]; then
-#	# Ubuntu
-#	WPA_SUP_OMIT_PIDFILE="/var/run/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
-#	WPA_CLI_OMIT_PIDFILE="/var/run/sendsigs.omit.d/wpasupplicant.wpa_action.${WPA_IFACE}.pid"
+elif [ -d /var/run/sendsigs.omit.d/ ]; then
+	# Ubuntu, see https://launchpad.net/bugs/181541 for status
+	WPA_SUP_OMIT_PIDFILE="/var/run/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
+	WPA_CLI_OMIT_PIDFILE="/var/run/sendsigs.omit.d/wpasupplicant.wpa_action.${WPA_IFACE}.pid"
 else
 	WPA_SUP_OMIT_PIDFILE=
 	WPA_CLI_OMIT_PIDFILE=

Modified: wpasupplicant/trunk/debian/wpasupplicant.wpa-ifupdown.init
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.wpa-ifupdown.init?rev=1020&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.wpa-ifupdown.init (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.wpa-ifupdown.init Wed Jan  9 17:19:29 2008
@@ -59,9 +59,9 @@
 	if [ -d /lib/init/rw/sendsigs.omit.d/ ]; then
 		# Debian
 		return 0
-	#elif [ /var/run/sendsigs.omit.d/ ]; then
-	#	# Ubuntu
-	#	return 0
+	elif [ /var/run/sendsigs.omit.d/ ]; then
+		# Ubuntu, cf. https://bugs.launchpad.net/bugs/181541
+		return 0
 	fi
 
 	return 1