Re: [SRM] Bug #554793
On Tue, Jan 19, 2010 at 12:44:43PM +0100, Julien Cristau wrote:
> > > However, before we approve an upload, I would like to see a final - and
> > > tested - debdiff against the current stable package.
> >
> > Sure. File is attached. Please tell if this is okay.
> >
> No, it's not (attached). :)
Now it is! :-)
Sorry guys.
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 meskes@jabber.org
VfL Borussia! Força Barça! Go SF 49ers! Use Debian GNU/Linux, PostgreSQL
diff -u watchdog-5.4/debian/init watchdog-5.4/debian/init
--- watchdog-5.4/debian/init
+++ watchdog-5.4/debian/init
@@ -29,18 +29,31 @@
[ -e /etc/default/watchdog ] && . /etc/default/watchdog
NAME=watchdog
+KEEPALIVE_NAME=wd_keepalive
+
DAEMON=/usr/sbin/watchdog
+KEEPALIVE_DAEMON=/usr/sbin/wd_keepalive
+
+STOP_RETRY_SCHEDULE='TERM/10/forever/KILL/1'
case "$1" in
start)
if [ $run_watchdog = 1 ]
then
# do we have to load a module?
- [ $watchdog_module != "none" ] && /sbin/modprobe $watchdog_module
- # make sure that wd_keepalive is stopped if available
- [ -e /etc/init.d/wd_keepalive ] && /etc/init.d/wd_keepalive stop
+ [ ${watchdog_module:-none} != "none" ] && /sbin/modprobe $watchdog_module
+ # make sure that wd_keepalive is stopped
+ echo -n "Stopping watchdog keepalive daemon: "
+ if start-stop-daemon --stop --quiet -oknodo --retry $STOP_RETRY_SCHEDULE \
+ --pidfile /var/run/$KEEPALIVE_NAME.pid
+ then
+ echo wd_keepalive.
+ else
+ echo
+ fi
+
echo -n "Starting watchdog daemon: "
- if start-stop-daemon --start --quiet \
+ if start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
--exec $DAEMON -- $watchdog_options
then
echo watchdog.
@@ -54,12 +67,19 @@
if [ $run_watchdog = 1 ]
then
echo -n "Stopping watchdog daemon: "
- if start-stop-daemon --stop --quiet \
+ if start-stop-daemon --stop --quiet --retry $STOP_RETRY_SCHEDULE \
--pidfile /var/run/$NAME.pid
then
echo watchdog.
- # make sure that wd_keepalive is started if available
- [ -e /etc/init.d/wd_keepalive ] && /etc/init.d/wd_keepalive start
+ # make sure that wd_keepalive is started
+ echo -n "Starting watchdog keepalive daemon: "
+ if start-stop-daemon --start --quiet --pidfile /var/run/$KEEPALIVE_NAME.pid \
+ --exec $KEEPALIVE_DAEMON -- $watchdog_options
+ then
+ echo wd_keepalive.
+ else
+ echo
+ fi
else
echo
fi
@@ -73,9 +93,8 @@
force-reload)
if [ $run_watchdog = 0 ]; then exit 0; fi
echo -n "Restarting $NAME daemon."
- start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid
- echo -n "."
- sleep 5
+ start-stop-daemon --stop --pidfile /var/run/$NAME.pid --quiet \
+ --retry $STOP_RETRY_SCHEDULE
echo -n "."
if start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
--exec $DAEMON -- $watchdog_options
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-10lenny1) stable-proposed-updates; urgency=high
+
+ * Backported fixed init scripts to make sure one daemon really has ended before
+ the next one is started.
+
+ -- Michael Meskes <meskes@debian.org> Tue, 19 Jan 2010 09:11:56 +0100
+
watchdog (5.4-10) unstable; urgency=medium
* Preserve watchdog_module setting on upgrade, closes: 506376
Reply to: