Fixed gkrellmd init script and config (Bug #247068)

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686)

5 files changed, 16 insertions, 9 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 04562acc9e3d..8205df8782b7 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.161 2008/11/05 18:18:10 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.162 2008/11/17 21:27:32 lack Exp $
+
+  17 Nov 2008; Jim Ramsay <lack@gentoo.org> files/gkrellmd,
+  files/gkrellmd.conf, gkrellm-2.3.1.ebuild, gkrellm-2.3.2.ebuild:
+  Fixed gkrellmd init script and config (Bug #247068)
 
 *gkrellm-2.3.2 (05 Nov 2008)
 
diff --git a/app-admin/gkrellm/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd
index f7f90a24ab1c..d6e8f2841a64 100644
--- a/app-admin/gkrellm/files/gkrellmd
+++ b/app-admin/gkrellm/files/gkrellmd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.7 2008/02/28 15:17:04 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.8 2008/11/17 21:27:55 lack Exp $
 
 depend() {
 	need net
@@ -11,7 +11,7 @@ depend() {
 
 start() {
 	ebegin "Starting GNU Krell Monitor daemon"
-	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd ${GKRELLM_OPTS}
+	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd ${GKRELLMD_OPTS}
 	eend $?
 }
 
diff --git a/app-admin/gkrellm/files/gkrellmd.conf b/app-admin/gkrellm/files/gkrellmd.conf
index 1388801ccbd8..6b0d90df1092 100644
--- a/app-admin/gkrellm/files/gkrellmd.conf
+++ b/app-admin/gkrellm/files/gkrellmd.conf
@@ -1,5 +1,8 @@
-# Config file for gkrellmd
+# Config file for gkrellmd init script
 
 # If you need to pass extra options to gkrellmd, you may set them here.
 # See 'gkrellmd --help' for a list of options.
-# GKRELLMD_OPTS=""
+#
+# Note: Many options can be configured in /etc/gkrellmd.conf as well
+#
+#GKRELLMD_OPTS=""
diff --git a/app-admin/gkrellm/gkrellm-2.3.1.ebuild b/app-admin/gkrellm/gkrellm-2.3.1.ebuild
index 0ac1e3883362..bacf2e65729e 100644
--- a/app-admin/gkrellm/gkrellm-2.3.1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.1.ebuild,v 1.8 2008/09/27 16:29:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.1.ebuild,v 1.9 2008/11/17 21:27:32 lack Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -93,7 +93,7 @@ src_install() {
 	fi
 
 	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
-	doconfd "${FILESDIR}"/gkrellmd.conf || die "doconfd failed"
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
 
 	insinto /etc
 	doins server/gkrellmd.conf || die "doins failed"
diff --git a/app-admin/gkrellm/gkrellm-2.3.2.ebuild b/app-admin/gkrellm/gkrellm-2.3.2.ebuild
index eb05ac017dc7..286a4204f002 100644
--- a/app-admin/gkrellm/gkrellm-2.3.2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2.ebuild,v 1.1 2008/11/05 18:18:10 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2.ebuild,v 1.2 2008/11/17 21:27:32 lack Exp $
 
 EAPI=2
 
@@ -105,7 +105,7 @@ src_install() {
 	fi
 
 	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
-	doconfd "${FILESDIR}"/gkrellmd.conf || die "doconfd failed"
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
 
 	insinto /etc
 	doins server/gkrellmd.conf || die "doins failed"