summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2003-10-06 19:42:06 +0000
committerMike Frysinger <vapier@gentoo.org>2003-10-06 19:42:06 +0000
commitd6275134b8be604f7b71f88f36a7cfea17f32360 (patch)
tree9daa095ce07238bf559af735fe2a69f2f541bcd5
parentworkaround for #25754 (diff)
downloadhistorical-d6275134b8be604f7b71f88f36a7cfea17f32360.tar.gz
historical-d6275134b8be604f7b71f88f36a7cfea17f32360.tar.bz2
historical-d6275134b8be604f7b71f88f36a7cfea17f32360.zip
workaround for #25754
-rw-r--r--sys-apps/daemontools/files/svscan6
-rw-r--r--sys-apps/xinetd/files/xinetd.rc63
2 files changed, 7 insertions, 2 deletions
diff --git a/sys-apps/daemontools/files/svscan b/sys-apps/daemontools/files/svscan
index a1e388c30599..517c8c53553a 100644
--- a/sys-apps/daemontools/files/svscan
+++ b/sys-apps/daemontools/files/svscan
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/files/svscan,v 1.8 2003/09/08 21:31:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/daemontools/files/svscan,v 1.9 2003/10/06 19:42:06 vapier Exp $
depend() {
need net
@@ -14,9 +14,13 @@ depend() {
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 $?
}
diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6
index dd991b440e9a..ef01addd5133 100644
--- a/sys-apps/xinetd/files/xinetd.rc6
+++ b/sys-apps/xinetd/files/xinetd.rc6
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.14 2003/10/06 19:39:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.15 2003/10/06 19:41:16 vapier Exp $
opts="start stop reload restart dump check"
@@ -12,6 +12,7 @@ depend() {
start() {
ebegin "Starting xinetd"
(
+ # workaround for #25754
unset -f `declare -F | sed 's:declare -f::g'`
start-stop-daemon --start --quiet --exec /usr/sbin/xinetd \
-- -pidfile /var/run/xinetd.pid ${XINETD_OPTS}