nss-pam-ldapd commit: r2148 - debian/nss-pam-ldapd/trunk/debian

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Wed Feb 17 23:40:35 2016
New Revision: 2148
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=2148&view=revision

Log:
have init script stop action only return when nslcd has actually stopped 
(closes: #814881)

Modified:
   debian/nss-pam-ldapd/trunk/debian/changelog
   debian/nss-pam-ldapd/trunk/debian/nslcd.init

Modified: debian/nss-pam-ldapd/trunk/debian/changelog
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/changelog Sat Feb 13 14:03:49 2016        
(r2147)
+++ debian/nss-pam-ldapd/trunk/debian/changelog Wed Feb 17 23:40:35 2016        
(r2148)
@@ -2,8 +2,10 @@
 
   * debconf translation updates:
     - Brazilian Portuguese by Adriano Rafael Gomes (closes: #799414)
+  * have init script stop action only return when nslcd has actually stopped
+    (closes: #814881)
 
- -- Arthur de Jong <adejong@debian.org>  Sun, 20 Sep 2015 13:30:00 +0200
+ -- Arthur de Jong <adejong@debian.org>  Wed, 17 Feb 2016 23:30:00 +0100
 
 nss-pam-ldapd (0.9.6-3) unstable; urgency=medium
 

Modified: debian/nss-pam-ldapd/trunk/debian/nslcd.init
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/nslcd.init        Sat Feb 13 14:03:49 
2016        (r2147)
+++ debian/nss-pam-ldapd/trunk/debian/nslcd.init        Wed Feb 17 23:40:35 
2016        (r2148)
@@ -96,7 +96,7 @@
   if [ "$K5START_START" = "yes" ]
   then
     log_daemon_msg "Stopping $K5START_DESC" "k5start"
-    start-stop-daemon --stop --oknodo --pidfile $K5START_PIDFILE
+    start-stop-daemon --stop --oknodo --retry 10 --pidfile $K5START_PIDFILE
     log_end_msg $?
     # remove any left behind files
     [ -n "$K5START_PIDFILE" ] && rm -f $K5START_PIDFILE
@@ -129,7 +129,7 @@
 stop)
   # stop nslcd
   log_daemon_msg "Stopping $NSLCD_DESC" "$NSLCD_NAME"
-  start-stop-daemon --stop --oknodo \
+  start-stop-daemon --stop --oknodo --retry 10 \
                     --pidfile $NSLCD_PIDFILE \
                     --name "$NSLCD_NAME"
   log_end_msg $?
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/