conf.d file for watchdog init script

5 files changed, 24 insertions, 11 deletions

diff --git a/app-admin/watchdog/Manifest b/app-admin/watchdog/Manifest
index ada611b7de19..070bcf73a89a 100644
--- a/app-admin/watchdog/Manifest
+++ b/app-admin/watchdog/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 MD5 c371758f4f4b2031f28c883681bf306a ChangeLog 1158
-MD5 6d599cb9a1e9c7cf0e0b071276dbce3b watchdog-5.2.ebuild 1266
-MD5 25aa8903d92dd8a8726b76bf21329fea watchdog-5.2.4.ebuild 1242
+MD5 22ccd403860117b3e9763f4a2e3027b7 watchdog-5.2.ebuild 1333
+MD5 cb07147330894688ed0311063d8f855d watchdog-5.2.4.ebuild 1309
+MD5 757b9ad893b290e7f0e8281d87970b1e files/watchdog.conf.d 273
 MD5 b8a1e49beda941e07c53020b8fb7a1a9 files/digest-watchdog-5.2 64
 MD5 96232179b747a1bcacf83442f9217ec4 files/5.2-alpha.patch 329
-MD5 3b459c4fbb5ecd7ae24968d9adccb8de files/watchdog 640
+MD5 9295e082000d8e9585828e14b9247524 files/watchdog 660
 MD5 a9e8cf348af5828fbdc72e8c1a3bb730 files/5.2-sundries.patch 874
 MD5 0f333f39bc92c0a210e813ee338da9e7 files/digest-watchdog-5.2.4 71
 MD5 ba2c02768a2e772c14e6332dd6b2e65e files/5.2.4-sundries.patch 752
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBExmvHTu7gpaalycRAqmuAJ4pMB2inmGVsXtgzxHrOpmZO9p7KgCgyiDr
-Ipk9Ojhz1UVA/YrCWmp6HQo=
-=GUZQ
+iD8DBQFBIkrBHTu7gpaalycRAp5QAJ4qSb6gQM8apCMhggcJdlOVirPEcwCfVLUM
+V+u/hPz6wUqwIv9Q5x58TJ0=
+=U8Es
 -----END PGP SIGNATURE-----
diff --git a/app-admin/watchdog/files/watchdog b/app-admin/watchdog/files/watchdog
index f86aad917932..53536a32a7a4 100644
--- a/app-admin/watchdog/files/watchdog
+++ b/app-admin/watchdog/files/watchdog
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/files/watchdog,v 1.1 2004/08/06 05:39:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/files/watchdog,v 1.2 2004/08/17 18:13:04 vapier Exp $
 
 depend() {
 	need localmount
@@ -19,7 +19,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting watchdog"
-	start-stop-daemon --start --quiet --exec /usr/sbin/watchdog
+	start-stop-daemon --start --quiet --exec /usr/sbin/watchdog -- ${WATCHDOG_OPTS}
 	eend $?
 }
 
diff --git a/app-admin/watchdog/files/watchdog.conf.d b/app-admin/watchdog/files/watchdog.conf.d
new file mode 100644
index 000000000000..e5ddc090f8af
--- /dev/null
+++ b/app-admin/watchdog/files/watchdog.conf.d
@@ -0,0 +1,6 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/files/watchdog.conf.d,v 1.1 2004/08/17 18:13:04 vapier Exp $
+
+# for more info, see watchdog(8)
+WATCHDOG_OPTS=""
diff --git a/app-admin/watchdog/watchdog-5.2.4.ebuild b/app-admin/watchdog/watchdog-5.2.4.ebuild
index d2a2c2fd8a31..d1fba3e00a85 100644
--- a/app-admin/watchdog/watchdog-5.2.4.ebuild
+++ b/app-admin/watchdog/watchdog-5.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/watchdog-5.2.4.ebuild,v 1.1 2004/08/06 05:39:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/watchdog-5.2.4.ebuild,v 1.2 2004/08/17 18:13:04 vapier Exp $
 
 inherit eutils
 
@@ -34,8 +34,11 @@ src_compile() {
 src_install() {
 	dodir /etc/watchdog
 	make DESTDIR="${D}" install || die
+
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/watchdog
+	insinto /etc/conf.d
+	newins ${FILESDIR}/watchdog.conf.d watchdog
 }
 
 pkg_postinst() {
diff --git a/app-admin/watchdog/watchdog-5.2.ebuild b/app-admin/watchdog/watchdog-5.2.ebuild
index 410dee50b916..684c739ca03e 100644
--- a/app-admin/watchdog/watchdog-5.2.ebuild
+++ b/app-admin/watchdog/watchdog-5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/watchdog-5.2.ebuild,v 1.21 2004/08/06 05:39:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/watchdog/watchdog-5.2.ebuild,v 1.22 2004/08/17 18:13:04 vapier Exp $
 
 inherit eutils
 
@@ -33,8 +33,11 @@ src_compile() {
 src_install() {
 	dodir /etc/watchdog
 	make DESTDIR="${D}" install || die
+
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/watchdog
+	insinto /etc/conf.d
+	newins ${FILESDIR}/watchdog.conf.d watchdog
 }
 
 pkg_postinst() {