[pkg-wpa-devel] r1589 - in /hostapd/trunk/debian: changelog control ifupdown.sh postinst

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

Author: kelmo-guest
Date: Sun Jul 24 09:04:30 2011
New Revision: 1589

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1589
Log:
Use /run/sendsigs.omit.d/ for sendsigs omission pid file and depend on
initscripts (>= 2.88dsf-13.3).

Removed:
    hostapd/trunk/debian/postinst
Modified:
    hostapd/trunk/debian/changelog
    hostapd/trunk/debian/control
    hostapd/trunk/debian/ifupdown.sh

Modified: hostapd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/changelog?rev=1589&op=diff
==============================================================================
--- hostapd/trunk/debian/changelog (original)
+++ hostapd/trunk/debian/changelog Sun Jul 24 09:04:30 2011
@@ -1,14 +1,12 @@
 hostapd (1:0.7.3-3) unstable; urgency=low
 
-  * 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
+  * Use /run/sendsigs.omit.d/ for sendsigs omission pid file and depend on
+    initscripts (>= 2.88dsf-13.3).
   * Add a loop to ifupdown.sh to wait for creation of hostapd pid file before
     attempting creation of sensigs omission pid file, in some cases hostapd
     daemon can return before creation of the pid file has been written to disk.
 
- -- Kel Modderman <kel at otaku42.de>  Sun, 24 Jul 2011 17:52:37 +1000
+ -- Kel Modderman <kel at otaku42.de>  Sun, 24 Jul 2011 19:02:31 +1000
 
 hostapd (1:0.7.3-2) unstable; urgency=low
 

Modified: hostapd/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/control?rev=1589&op=diff
==============================================================================
--- hostapd/trunk/debian/control (original)
+++ hostapd/trunk/debian/control Sun Jul 24 09:04:30 2011
@@ -15,7 +15,7 @@
 
 Package: hostapd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-13)
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-13), initscripts (>= 2.88dsf-13.3)
 Description: user space IEEE 802.11 AP and IEEE 802.1X/WPA/WPA2/EAP Authenticator
  Originally, hostapd was an optional user space component for Host AP
  driver. It adds more features to the basic IEEE 802.11 management

Modified: hostapd/trunk/debian/ifupdown.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/ifupdown.sh?rev=1589&op=diff
==============================================================================
--- hostapd/trunk/debian/ifupdown.sh (original)
+++ hostapd/trunk/debian/ifupdown.sh Sun Jul 24 09:04:30 2011
@@ -31,18 +31,7 @@
 HOSTAPD_BIN="/usr/sbin/hostapd"
 HOSTAPD_PNAME="hostapd"
 HOSTAPD_PIDFILE="/var/run/hostapd.$IFACE.pid"
-
-HOSTAPD_OMIT_PIDFILE=
-if [ -d /run/sendsigs.omit.d/ ]; then
-	# Debian, initscripts (>= 2.88dsf-13.3)
-	WPA_SUP_OMIT_PIDFILE="/run/sendsigs.omit.d/hostapd.${WPA_IFACE}.pid"
-elif [ -d /lib/init/rw/sendsigs.omit.d/ ]; then
-	# Debian, initscripts (< 2.88dsf-13.3)
-	HOSTAPD_OMIT_PIDFILE="/lib/init/rw/sendsigs.omit.d/hostapd.$IFACE.pid"
-elif [ -d /var/run/sendsigs.omit.d/ ]; then
-	# Ubuntu (< "oneiric")
-	HOSTAPD_OMIT_PIDFILE="/var/run/sendsigs.omit.d/hostapd.$IFACE.pid"
-fi
+HOSTAPD_OMIT_PIDFILE="/run/sendsigs.omit.d/hostapd.$IFACE.pid"
 
 if [ ! -x "$HOSTAPD_BIN" ]; then
 	exit 0
@@ -97,20 +86,18 @@
 		return "$?"
 	fi
 
-	if [ "$HOSTAPD_OMIT_PIDFILE" ]; then
-		HOSTAPD_PIDFILE_WAIT=0
-		until [ -s "$HOSTAPD_PIDFILE" ]; do
-			if [ "$HOSTAPD_PIDFILE_WAIT" -ge 5 ]; then
-				hostapd_msg stderr \
-					"timeout waiting for pid file creation"
-				return 1
-			fi
+	HOSTAPD_PIDFILE_WAIT=0
+	until [ -s "$HOSTAPD_PIDFILE" ]; do
+		if [ "$HOSTAPD_PIDFILE_WAIT" -ge 5 ]; then
+			hostapd_msg stderr \
+				"timeout waiting for pid file creation"
+			return 1
+		fi
 
-			HOSTAPD_PIDFILE_WAIT=$(($HOSTAPD_PIDFILE_WAIT + 1))
-			sleep 1
-		done
-		cat "$HOSTAPD_PIDFILE" > "$HOSTAPD_OMIT_PIDFILE"
-	fi
+		HOSTAPD_PIDFILE_WAIT=$(($HOSTAPD_PIDFILE_WAIT + 1))
+		sleep 1
+	done
+	cat "$HOSTAPD_PIDFILE" > "$HOSTAPD_OMIT_PIDFILE"
 
 	return 0
 }