supervise fixes

2 files changed, 1 insertions, 50 deletions

diff --git a/sys-apps/gluelog/files/sysklogd b/sys-apps/gluelog/files/sysklogd
deleted file mode 100755
index f69975f5d85b..000000000000
--- a/sys-apps/gluelog/files/sysklogd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#RCUPDATE:1 2 3 4 5:20:This line is required for script management
-
-klog="/usr/sbin/klogd"
-slog="/usr/sbin/syslogd"
-
-. /etc/rc.d/config/functions
-
-SERVICE=sysklogd
-opts="start stop status"
-
-start() {
-    ebegin "Starting supervised syslog and klog"
-    local retval
-	local x
-	retval=0
-	
-	for x in klog syslog
-	do
-		/usr/bin/svc -u /etc/svc.d/control/${x}
-		retval=$(( $? + $retval ))
-	done
-    eend $retval 
-}
-
-stop() {
-    ebegin "Stopping supervised syslog and klog"
-   	/usr/bin/svc -d /etc/svc.d/control/klog /etc/svc.d/control/syslog 
-    eend $? 
-}
-
-status() {
-	einfo "syslog and klog status:"
-	/usr/bin/svstat /etc/svc.d/control/klog /etc/svc.d/control/syslog
-}
-
-doservice ${@}
diff --git a/sys-apps/gluelog/gluelog-1.0.ebuild b/sys-apps/gluelog/gluelog-1.0.ebuild
index 519feebe2ca6..bf39bf360054 100644
--- a/sys-apps/gluelog/gluelog-1.0.ebuild
+++ b/sys-apps/gluelog/gluelog-1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gluelog/gluelog-1.0.ebuild,v 1.2 2000/12/10 05:35:55 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gluelog/gluelog-1.0.ebuild,v 1.3 2000/12/13 15:13:59 achim Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Pipe and socket fittings for the system and kernel logs"
@@ -33,17 +33,5 @@ src_install() {
 		touch ${D}/etc/svc.d/services/${x}/down
 		install -d -m0750 -o daemon -g wheel ${D}/var/log/${x}.d
 	done
-	exeopts -m0755
-	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/sysklogd
 }
 
-pkg_preinst() {
-	[ "$ROOT" = "/" ] && [ -e /etc/rc.d/init.d/sysklogd ] && /etc/rc.d/init.d/sysklogd stop
-	${ROOT}/usr/sbin/rc-update del sysklogd
-}
-
-pkg_postinst() {
-	${ROOT}/usr/sbin/rc-update add sysklogd
-	[ "$ROOT" = "/" ] && /etc/rc.d/init.d/sysklogd start
-}