Init script actually works now, #112950.

(Portage version: 2.0.51.22-r3)

4 files changed, 30 insertions, 73 deletions

diff --git a/sys-process/daemontools/files/digest-daemontools-0.76-r4 b/sys-process/daemontools/files/digest-daemontools-0.76-r5
index 0d344babc47a..0d344babc47a 100644
--- a/sys-process/daemontools/files/digest-daemontools-0.76-r4
+++ b/sys-process/daemontools/files/digest-daemontools-0.76-r5
diff --git a/sys-process/daemontools/files/svscan b/sys-process/daemontools/files/svscan
deleted file mode 100755
index b6ac2dcc190a..000000000000
--- a/sys-process/daemontools/files/svscan
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/files/svscan,v 1.1 2005/03/03 18:11:26 ciaranm Exp $
-
-depend() {
-	need net
-	after net
-	before ntpd
-	before spamd
-	before apache
-	before apache2
-}
-
-start() {
-	ebegin "Starting service scan"
-	(
-	# workaround for #25754
-	unset -f `declare -F | sed 's:declare -f::g'`
-	PATH="/usr/bin:$PATH"
-	start-stop-daemon --start --quiet --exec /usr/bin/svscan --pidfile /var/run/svscan.pid -- /service &
-	echo $! > /var/run/svscan.pid
-	)
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping service scan"
-	start-stop-daemon --stop --quiet --pidfile /var/run/svscan.pid
-	eend $?
-	ebegin "Stopping services"
-	svc -dx /service/*
-	eend $?
-	ebegin "Stopping service logging"
-	svc -dx /service/*/log
-	eend $?
-}
diff --git a/sys-process/daemontools/files/svscan-0.76-r4 b/sys-process/daemontools/files/svscan-0.76-r4
deleted file mode 100755
index a8b700a39b4c..000000000000
--- a/sys-process/daemontools/files/svscan-0.76-r4
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/files/svscan-0.76-r4,v 1.2 2005/04/27 23:41:30 vapier Exp $
-
-depend() {
-	need net
-	after net
-	before ntpd ntp-client
-	before spamd
-	before apache apache2
-}
-
-start() {
-	ebegin "Starting service scan"
-	(
-	# workaround for #25754
-	unset -f `declare -F | sed 's:declare -f::g'`
-	PATH="/usr/bin:$PATH"
-	start-stop-daemon --start --quiet --exec /usr/bin/svscan --pidfile /var/run/svscan.pid -- /service &
-	echo $! > /var/run/svscan.pid
-	)
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping service scan"
-	start-stop-daemon --stop --quiet --pidfile /var/run/svscan.pid
-	eend $?
-	ebegin "Stopping services"
-	svc -dx /service/* 2>/dev/null
-	eend $?
-	ebegin "Stopping service logging"
-	svc -dx /service/*/log 2>/dev/null
-	eend $?
-}
diff --git a/sys-process/daemontools/files/svscan.init b/sys-process/daemontools/files/svscan.init
new file mode 100644
index 000000000000..8778c74fcdc5
--- /dev/null
+++ b/sys-process/daemontools/files/svscan.init
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/files/svscan.init,v 1.1 2005/12/11 09:49:54 uberlord Exp $
+
+depend() {
+	use net
+	before ntpd ntp-client spamd apache apache2
+}
+
+start() {
+	ebegin "Starting service scan"
+	start-stop-daemon --start --exec /usr/bin/svscan \
+		--background --make-pidfile \
+		--pidfile /var/run/svscan.pid -- /service
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping service scan services"
+	svc -dx /service/* 2>/dev/null
+	eend $?
+	ebegin "Stopping service scan logging"
+	svc -dx /service/*/log 2>/dev/null
+	eend $?
+	ebegin "Stopping service scan"
+	start-stop-daemon --stop --exec /usr/bin/svscan \
+		--pidfile /var/run/svscan.pid
+	eend $?
+}