On Mon, Jan 25, 2010 at 07:40:12PM +0000, Adam D. Barratt wrote: > I'll leave it to your judgement as to whether an updated package is > warranted, but if you are going to prepare an update, please do so
Tim's reasoning convinced me. Patch ist attached. > sooner rather than later so that it can get built and uploaded > everywhere in time for the point release. Please tell me if I should upload. Michael -- Michael Meskes Michael at Fam-Meskes dot De, Michael at Meskes dot (De|Com|Net|Org) Michael at BorussiaFan dot De, Meskes at (Debian|Postgresql) dot Org ICQ 179140304, AIM/Yahoo/Skype michaelmeskes, Jabber [email protected] VfL Borussia! Força Barça! Go SF 49ers! Use Debian GNU/Linux, PostgreSQL
diff -u watchdog-5.4/debian/changelog watchdog-5.4/debian/changelog --- watchdog-5.4/debian/changelog +++ watchdog-5.4/debian/changelog @@ -1,3 +1,10 @@ +watchdog (5.4-10lenny2) stable-proposed-updates; urgency=high + + * Also backported fix to other init script, that appears to be used more than + expected. + + -- Michael Meskes <[email protected]> Tue, 26 Jan 2010 12:10:58 +0100 + watchdog (5.4-10lenny1) stable-proposed-updates; urgency=high * Backported fixed init scripts to make sure one daemon really has ended only in patch2: unchanged: --- watchdog-5.4.orig/debian/wd_keepalive.init +++ watchdog-5.4/debian/wd_keepalive.init @@ -31,11 +31,13 @@ NAME=wd_keepalive DAEMON=/usr/sbin/wd_keepalive +STOP_RETRY_SCHEDULE='TERM/10/forever/KILL/1' + case "$1" in start) if [ $run_watchdog = 1 ] then - [ $watchdog_module != "none" ] && /sbin/modprobe $watchdog_module + [ ${watchdog_module:-none} != "none" ] && /sbin/modprobe $watchdog_module echo -n "Starting watchdog keepalive daemon: " if start-stop-daemon --start --quiet \ --exec $DAEMON -- $watchdog_options @@ -51,8 +53,8 @@ if [ $run_watchdog = 1 ] then echo -n "Stopping watchdog keepalive daemon: " - if start-stop-daemon --stop --quiet \ - --pidfile /var/run/$NAME.pid + if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ + --retry $STOP_RETRY_SCHEDULE then echo wd_keepalive. else @@ -68,9 +70,8 @@ force-reload) if [ $run_watchdog = 0 ]; then exit 0; fi echo -n "Restarting $NAME daemon." - /etc/init.d/$NAME stop > /dev/null 2>&1 - echo -n "." - sleep 5 + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ + --retry $STOP_RETRY_SCHEDULE echo -n "." if start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ --exec $DAEMON -- $watchdog_options
