summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-08-24 21:01:50 +0000
committerMike Frysinger <vapier@gentoo.org>2010-08-24 21:01:50 +0000
commit83cf1608a6fc8355a4c1b9a77fa0330e98d1f07c (patch)
treeec1e9fcf76a83cea22b39d460e296c8895296d7f /sys-apps/watchdog
parentmake sure the sort is in a C locale #333773 by Michał Górny (diff)
downloadgentoo-2-83cf1608a6fc8355a4c1b9a77fa0330e98d1f07c.tar.gz
gentoo-2-83cf1608a6fc8355a4c1b9a77fa0330e98d1f07c.tar.bz2
gentoo-2-83cf1608a6fc8355a4c1b9a77fa0330e98d1f07c.zip
Fix infinite loop bug in get_config #333441 by mario.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/watchdog')
-rw-r--r--sys-apps/watchdog/ChangeLog7
-rw-r--r--sys-apps/watchdog/files/watchdog-init.d3
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog
index 26f580e913d2..af8158eaba45 100644
--- a/sys-apps/watchdog/ChangeLog
+++ b/sys-apps/watchdog/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/watchdog
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.27 2009/05/16 16:59:26 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.28 2010/08/24 21:01:50 vapier Exp $
+
+ 24 Aug 2010; Mike Frysinger <vapier@gentoo.org> files/watchdog-init.d:
+ Fix infinite loop bug in get_config #333441 by mario.
16 May 2009; Mike Frysinger <vapier@gentoo.org> files/watchdog-init.d:
Use --pidfile with ssd, as well as a better --retry value #269697 by
diff --git a/sys-apps/watchdog/files/watchdog-init.d b/sys-apps/watchdog/files/watchdog-init.d
index b3fa9f6e3cae..e80f4c3cf884 100644
--- a/sys-apps/watchdog/files/watchdog-init.d
+++ b/sys-apps/watchdog/files/watchdog-init.d
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-init.d,v 1.2 2009/05/16 16:59:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-init.d,v 1.3 2010/08/24 21:01:50 vapier Exp $
depend() {
need localmount
@@ -15,6 +15,7 @@ get_config() {
echo $2
return
fi
+ shift
done
echo /etc/watchdog.conf
}