conversion from /etc/svc.d to /etc/supervise and /var/supervise

7 files changed, 20 insertions, 21 deletions

diff --git a/sys-apps/baselayout/files/inittab b/sys-apps/baselayout/files/inittab
index 3486dc1b3f30..5690fbdaab2a 100644
--- a/sys-apps/baselayout/files/inittab
+++ b/sys-apps/baselayout/files/inittab
@@ -52,6 +52,6 @@ ca:12345:ctrlaltdel:/sbin/shutdown -t1 -r now
 # Start svscan process in runlevels 2 through 5
 # Placing it here makes sure that it respawns if it dies, but keeping it our of runlevel 1 prevents
 # svscan from starting before the system is ready.
-SV:2345:respawn:env - PATH=/usr/local/bin:/usr/sbin:/usr/bin:/bin svscan /etc/svc.d/control < /dev/null > /dev/console 2>/dev/console
+SV:2345:respawn:env - PATH=/usr/local/bin:/usr/sbin:/usr/bin:/bin svscan /etc/supervise < /dev/null > /dev/console 2>/dev/console
 
 # End of /etc/inittab
diff --git a/sys-apps/baselayout/files/rc.d/init.d/sysklogd b/sys-apps/baselayout/files/rc.d/init.d/sysklogd
index 87d35fc0bb72..e3ecac3ad592 100755
--- a/sys-apps/baselayout/files/rc.d/init.d/sysklogd
+++ b/sys-apps/baselayout/files/rc.d/init.d/sysklogd
@@ -35,7 +35,7 @@ supervise_start() {
 
 	for x in klog syslog
 	do
-		/usr/bin/svc -u /etc/svc.d/control/${x}
+		/usr/bin/svc -u /etc/supervise/${x}
 		retval=$(( $? + $retval ))
 	done
     eend $retval
@@ -43,7 +43,7 @@ supervise_start() {
 
 supervise_stop() {
     ebegin "Stopping supervised syslog and klog"
-   	/usr/bin/svc -d /etc/svc.d/control/klog /etc/svc.d/control/syslog
+   	/usr/bin/svc -d /etc/supervise/syslog /etc/supervise/klog
     eend $?
 }
 
diff --git a/sys-apps/dcron/dcron-2.7.ebuild b/sys-apps/dcron/dcron-2.7.ebuild
index cf4c03ee30fd..7edf4591325d 100644
--- a/sys-apps/dcron/dcron-2.7.ebuild
+++ b/sys-apps/dcron/dcron-2.7.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/dcron/dcron-2.7.ebuild,v 1.3 2000/12/23 00:29:11 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dcron/dcron-2.7.ebuild,v 1.4 2000/12/24 05:26:17 drobbins Exp $
 
 A=dcron27.tgz
 S=${WORKDIR}/dcron
@@ -30,15 +30,14 @@ src_install() {
 	dodoc CHANGELOG README
 
 	#set up supervise support
-	dodir /etc/svc.d/services/dcron
-	exeinto /etc/svc.d/services/dcron
+	dodir /var/supervise/dcron /etc/supervise
+	exeinto /var/supervise/dcron
 	newexe ${FILESDIR}/dcron-run run
 	#this next line tells svcan to start the log process too (and set up a pipe)
-	chmod +t ${D}/etc/svc.d/services/dcron
-	exeinto /etc/svc.d/services/log
+	chmod +t ${D}/var/supervise/dcron
+	exeinto /var/supervise/dcron/log
 	newexe ${FILESDIR}/log-run run
-	dodir /etc/svc.d/control
-	dosym ../services/dcron /etc/svc.d/control/dcron	
+	dosym /var/supervise/cron /etc/supervise/cron 	
 
 	#install rc script
 	exeinto /etc/rc.d/init.d
diff --git a/sys-apps/dcron/files/dcron b/sys-apps/dcron/files/dcron
index 81103a91d9a2..c4d1efd59dba 100755
--- a/sys-apps/dcron/files/dcron
+++ b/sys-apps/dcron/files/dcron
@@ -6,7 +6,7 @@
 
 SERVICE=dcron
 EXE="/usr/sbin/crond"
-SVCDIR=/etc/svc.d/control/dcron
+SVCDIR=/etc/supervise/dcron
 opts="start stop"
 
 start() {
diff --git a/sys-apps/gluelog/gluelog-1.0-r1.ebuild b/sys-apps/gluelog/gluelog-1.0-r1.ebuild
index 93bd2cdb3de3..c78fc96594f3 100644
--- a/sys-apps/gluelog/gluelog-1.0-r1.ebuild
+++ b/sys-apps/gluelog/gluelog-1.0-r1.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-r1.ebuild,v 1.1 2000/12/23 00:29:31 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gluelog/gluelog-1.0-r1.ebuild,v 1.2 2000/12/24 05:26:23 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Pipe and socket fittings for the system and kernel logs"
@@ -22,14 +22,14 @@ src_install() {
 	dodir /usr/sbin
 	dosbin ${S}/gluelog ${S}/glueklog
 	exeopts -m0750 -g wheel
-	install -d -m0750 -o root -g wheel ${D}/etc/svc.d/control
+	install -d -m0750 -o root -g wheel ${D}/etc/supervise
 	dodir /var/log
 	local x
 	for x in syslog klog
 	do
-		exeinto /etc/svc.d/services/${x}
+		exeinto /var/supervise/${x}
 		newexe ${FILESDIR}/${x}-run run
-		ln -s ../services/${x} ${D}/etc/svc.d/control/${x}
+		ln -s /var/supervise/${x} ${D}/etc/supervise/${x}
 		install -d -m0750 -o daemon -g wheel ${D}/var/log/${x}.d
 	done
 }
diff --git a/sys-apps/xinetd/files/xinetd b/sys-apps/xinetd/files/xinetd
index b3069bc91c42..999655f810e1 100755
--- a/sys-apps/xinetd/files/xinetd
+++ b/sys-apps/xinetd/files/xinetd
@@ -43,13 +43,13 @@ supervise_start() {
 		prepconfig
 
 		ebegin "Starting ${SERVICE} supervised"
-		/usr/bin/svc -u /etc/svc.d/control/xinetd
+		/usr/bin/svc -u /etc/supervise/xinetd
 		eend $? "Error starting ${SERVICE} supervised."
 }
 
 supervise_stop() {
 		ebegin "Stopping ${SERVICE} supervised"
-		/usr/bin/svc -d /etc/svc.d/control/xinetd
+		/usr/bin/svc -d /etc/supervise/xinetd
 		eend $? "Error stopping ${SERVICE}. supervised"
 }
 
diff --git a/sys-apps/xinetd/xinetd-2.1.8.8_p3-r3.ebuild b/sys-apps/xinetd/xinetd-2.1.8.8_p3-r3.ebuild
index 32465272c36d..300f1be6efc1 100644
--- a/sys-apps/xinetd/xinetd-2.1.8.8_p3-r3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.1.8.8_p3-r3.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.1.8.8_p3-r3.ebuild,v 1.1 2000/12/23 00:29:43 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.1.8.8_p3-r3.ebuild,v 1.2 2000/12/24 05:26:26 drobbins Exp $
 
 P=xinetd-2.1.8.8p3
 A=${P}.tar.gz
@@ -29,10 +29,10 @@ src_install() {
     doexe ${FILESDIR}/xinetd
 	insinto /etc
 #	doins ${FILESDIR}/xinetd.conf
-	dodir /etc/svc.d/control
-	exeinto /etc/svc.d/services/xinetd
+	dodir /etc/supervise
+	exeinto /var/supervise/xinetd
 	newexe ${FILESDIR}/xinetd-run run
-	ln -s ../services/xinetd ${D}/etc/svc.d/control/xinetd
+	ln -s /var/supervise/xinetd /etc/supervise/xinetd 
 }