From e9f0418938f3c2287f892e382dda2b29ae6ff89a Mon Sep 17 00:00:00 2001 From: Ludovic Rousseau Date: Sat, 2 Feb 2008 16:39:53 +0000 Subject: [PATCH] do not try to kill children since pcscd do not fork --- pcsc-lite/trunk/trunk/debian/changelog | 4 +++- pcsc-lite/trunk/trunk/debian/pcscd.init | 11 ----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pcsc-lite/trunk/trunk/debian/changelog b/pcsc-lite/trunk/trunk/debian/changelog index 9e24a3a..d4a6858 100644 --- a/pcsc-lite/trunk/trunk/debian/changelog +++ b/pcsc-lite/trunk/trunk/debian/changelog @@ -2,8 +2,10 @@ pcsc-lite (1.4.99-2) unstable; urgency=low * debian/pcscd.init: include /etc/default/pcscd if present and document its usage + * debian/pcscd.init + - do not try to kill children since pcscd do not fork - -- Ludovic Rousseau Sun, 20 Jan 2008 15:21:12 +0100 + -- Ludovic Rousseau Sat, 02 Feb 2008 17:39:16 +0100 pcsc-lite (1.4.99-1) unstable; urgency=low diff --git a/pcsc-lite/trunk/trunk/debian/pcscd.init b/pcsc-lite/trunk/trunk/debian/pcscd.init index 6a55987..d3bb111 100644 --- a/pcsc-lite/trunk/trunk/debian/pcscd.init +++ b/pcsc-lite/trunk/trunk/debian/pcscd.init @@ -85,17 +85,6 @@ do_stop() start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME RETVAL="$?" [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" } #