summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/watchdog')
-rw-r--r--sys-apps/watchdog/ChangeLog6
-rw-r--r--sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d6
2 files changed, 8 insertions, 4 deletions
diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog
index 1b77adb4692a..84bd0bdb8d1e 100644
--- a/sys-apps/watchdog/ChangeLog
+++ b/sys-apps/watchdog/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/watchdog
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.5 2006/01/02 17:37:58 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.6 2006/02/01 15:37:43 brix Exp $
+
+ 01 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
+ files/watchdog-5.2.4_p5-init.d:
+ Add retry timeout of 5 seconds to stop() function in init script, bug #120044.
02 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
watchdog-5.2.4_p5.ebuild:
diff --git a/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d b/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d
index 927048606598..dc7df863d637 100644
--- a/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d
+++ b/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d,v 1.1 2005/11/27 10:14:24 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d,v 1.2 2006/02/01 15:37:43 brix Exp $
depend() {
need localmount
@@ -17,6 +17,6 @@ start() {
stop() {
ebegin "Stopping watchdog"
- start-stop-daemon --stop --quiet --exec /usr/sbin/watchdog
+ start-stop-daemon --stop --retry 5 --quiet --exec /usr/sbin/watchdog
eend ${?}
}