[kernel] r8008 - dists/trunk/ipw3945d/debian

[Jurij Smakov]

Author: jurij-guest
Date: Fri Dec 15 05:32:02 2006
New Revision: 8008

Modified:
   dists/trunk/ipw3945d/debian/changelog
   dists/trunk/ipw3945d/debian/init
Log:
* Prepare 1.7.22-3, update changelog.
* Add a workaround to avoid starting the second instance of the
  daemon (#401558)


Modified: dists/trunk/ipw3945d/debian/changelog
==============================================================================
--- dists/trunk/ipw3945d/debian/changelog	(original)
+++ dists/trunk/ipw3945d/debian/changelog	Fri Dec 15 05:32:02 2006
@@ -1,3 +1,17 @@
+ipw3945d (1.7.22-3) unstable; urgency=low
+
+  * Add a workaround to prevent the daemon from being started
+    twice. That may happen when it is started before the /var/run
+    directory is cleaned up, so the pid file is lost. Now we
+    check for such conditions and stop the daemon first, if it
+    is running without a proper pid file. Thanks to Dieter Roels
+    for help with debugging and testing. Closes: #401558
+  * Increase the delay after start from one to three seconds to
+    finally get rid of all the timing issues (ifup would still
+    fail occasionally with one second delay).
+
+ -- Jurij Smakov <jurij at debian.org>  Tue, 12 Dec 2006 23:09:45 -0800
+	
 ipw3945d (1.7.22-2) unstable; urgency=low
   
   * Following the suggestion by Malte Schirmacher, add one second

Modified: dists/trunk/ipw3945d/debian/init
==============================================================================
--- dists/trunk/ipw3945d/debian/init	(original)
+++ dists/trunk/ipw3945d/debian/init	Fri Dec 15 05:32:02 2006
@@ -56,7 +56,8 @@
 }
 
 # Check for a stale pid file and remove it, if present. If there is
-# a non-zero argument, the removal is silent (no warning emitted)
+# a non-zero argument, the removal is silent (no warning emitted).
+# Also, try stopping the daemon if it is running without a pid file.
 remove_stale_pid() {
   if test -e "${DAEMON_PID_FILE}"; then
     pid=$(cat "${DAEMON_PID_FILE}")
@@ -65,6 +66,12 @@
       test -n "${1}" || log_warning_msg "${msg}"
       rm -f "${DAEMON_PID_FILE}"
     fi
+  else
+    # Under some rare circumstances it is possible that daemon
+    # is running, but pid file is missing (bug #401558). So, if we 
+    # don't have a pid file, we try to kill it by name just in case.
+    start-stop-daemon --stop --quiet --exec /sbin/ipw3945d \
+                      --signal HUP > /dev/null 2>&1
   fi
 }