fixed init scripts

(Portage version: 2.0.51.21-r1)

3 files changed, 12 insertions, 22 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index a19b5c1ad192..54b03c4ece15 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.54 2005/05/11 20:16:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.55 2005/05/14 17:10:03 cardoe Exp $
+
+  14 May 2005; Doug Goldstein <cardoe@gentoo.org>
+  files/0.18-mythbackend.conf, files/0.18-mythbackend.rc:
+  Fixed up init scripts
 
 *mythtv-0.18-r1 (11 May 2005)
 
diff --git a/media-tv/mythtv/files/0.18-mythbackend.conf b/media-tv/mythtv/files/0.18-mythbackend.conf
index 6d0f6815af8d..e26538bb27ac 100644
--- a/media-tv/mythtv/files/0.18-mythbackend.conf
+++ b/media-tv/mythtv/files/0.18-mythbackend.conf
@@ -1,9 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation 
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/0.18-mythbackend.conf,v 1.1 2005/05/11 20:16:42 cardoe Exp $
-
-# Uncomment this to disable the permission warnings.
-MYTH_WARN=yes
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/0.18-mythbackend.conf,v 1.2 2005/05/14 17:10:03 cardoe Exp $
 
 # Specify which user to run as
 #
@@ -16,12 +13,6 @@ MYTH_WARN=yes
 #       audio and video groups.
 MYTH_USER=root
 
-# Specify which file to use for the backend log.
-#MYTH_LOG=/var/log/mythtv/mythbackend.log
-
-# Specify in which file to store the backend process id.
-#MYTH_PID=/var/run/mythtv/mythbackend.pid
-
 # Specify debug-level in log.
 # Accepts any combination (separated by comma) of:
 # all,none,quiet,record,playback,channel,osd,file,
diff --git a/media-tv/mythtv/files/0.18-mythbackend.rc b/media-tv/mythtv/files/0.18-mythbackend.rc
index 97aaf0a181c8..b745146b5b97 100644
--- a/media-tv/mythtv/files/0.18-mythbackend.rc
+++ b/media-tv/mythtv/files/0.18-mythbackend.rc
@@ -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/media-tv/mythtv/files/0.18-mythbackend.rc,v 1.1 2005/05/11 20:16:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/0.18-mythbackend.rc,v 1.2 2005/05/14 17:10:03 cardoe Exp $
 
 depend() {
 	need net
@@ -28,32 +28,27 @@ checkconfig() {
 }
 
 start() {
+	checkconfig
 	[[ -z "${MYTH_USER}" ]] && MYTH_USER="nobody:nobody"
-	[[ -z "${MYTH_LOG}" ]] && MYTH_LOG="/var/log/mythtv/mythbackend.log"
-	[[ -z "${MYTH_PID}" ]] && MYTH_PID="/var/run/mythbackend.pid"
-	[[ -z "${MYTH_WARN}" || "${MYTH_WARN}" == "yes" ]] && checkconfig
 	[[ -z "${MYTH_NICE}" ]] && MYTH_NICE="0"
 	[[ -z "${MYTH_VERBOSE}" ]] && MYTH_VERBOSE="none"
 
-	HOME="$(dirname "${MYTH_PID}")"
+	HOME="/var/log/mythtv/"
 	QTDIR=/usr/qt/3
 
 	# Work around any strange permissions that may be on these files.
-	chown -R "${MYTH_USER}" "$(dirname "${MYTH_LOG}")"
-	chown -R "${MYTH_USER}" "$(dirname "${MYTH_PID}")"
+	chown -R "${MYTH_USER}" /var/log/mythtv/
 
 	ebegin "Starting myth backend"
 	start-stop-daemon --start --quiet --chuid "${MYTH_USER}" \
 		--exec /usr/bin/mythbackend --nicelevel "${MYTH_NICE}" -- \
-		--daemon --pidfile "${MYTH_PID}" --logfile "${MYTH_LOG}" \
+		--daemon --pidfile /var/run/mythbackend.pid --logfile /var/log/mythtv/mythbackend.log \
 		--verbose ${MYTH_VERBOSE}
 	eend $?
 }
 
 stop () {
-	[[ -z "${MYTH_PID}" ]] && MYTH_PID="/var/run/mythbackend.pid"
-
 	ebegin "Stopping myth backend"
-	start-stop-daemon --stop --quiet --pidfile="${MYTH_PID}"
+	start-stop-daemon --stop --quiet --pidfile=/var/run/mythbackend.pid
 	eend $?
 }