diff options
| author | schmonz <schmonz@pkgsrc.org> | 2017-07-30 05:45:22 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2017-07-30 05:45:22 +0000 |
| commit | 7c838dc74fdf7187171a2be92848c0fe1280bfe4 (patch) | |
| tree | 9f817012cc0112633908dca9c9389954c70325bf /sysutils/daemontools-run | |
| parent | 2a8a8e25ad28633fb8f395edc0bb2ddafa70011c (diff) | |
| download | pkgsrc-7c838dc74fdf7187171a2be92848c0fe1280bfe4.tar.gz | |
Add PREFIX/{sbin,bin} to PATH, and don't hide diagnostics. Bump version.
Diffstat (limited to 'sysutils/daemontools-run')
| -rw-r--r-- | sysutils/daemontools-run/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/daemontools-run/files/svscan.sh | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sysutils/daemontools-run/Makefile b/sysutils/daemontools-run/Makefile index 4a1fe97cc9d..21e2d446583 100644 --- a/sysutils/daemontools-run/Makefile +++ b/sysutils/daemontools-run/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2017/07/27 04:10:30 schmonz Exp $ +# $NetBSD: Makefile,v 1.3 2017/07/30 05:45:22 schmonz Exp $ # -DISTNAME= daemontools-run-20170727 +DISTNAME= daemontools-run-20170730 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/sysutils/daemontools-run/files/svscan.sh b/sysutils/daemontools-run/files/svscan.sh index e2dedf7fffd..a725cb950a9 100644 --- a/sysutils/daemontools-run/files/svscan.sh +++ b/sysutils/daemontools-run/files/svscan.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: svscan.sh,v 1.1 2017/07/27 04:05:16 schmonz Exp $ +# $NetBSD: svscan.sh,v 1.2 2017/07/30 05:45:22 schmonz Exp $ # # @PKGNAME@ script to control svscan (service supervisor). # @@ -12,7 +12,7 @@ name="svscan" # User-settable rc.conf variables and their default values: -: ${svscan_postenv:="PATH=$PATH"} +: ${svscan_postenv:="PATH=@PREFIX@/sbin:@PREFIX@/bin:$PATH"} : ${svscan_datalimit:="3000000"} : ${svscan_servicedir:="@VARBASE@/service"} : ${svscan_log:="YES"} @@ -33,8 +33,7 @@ svscan_precmd() if [ -f /etc/rc.subr ] && ! checkyesno svscan_log; then svscan_logcmd=${svscan_nologcmd} fi - command="exec </dev/null >/dev/null 2>/dev/null -@PREFIX@/bin/pgrphack @SETENV@ - ${svscan_postenv} + command="@PREFIX@/bin/pgrphack @SETENV@ - ${svscan_postenv} @PREFIX@/bin/${name} ${svscan_servicedir} 2>&1 | @PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @DAEMONTOOLS_LOG_USER@ ${svscan_logcmd}" |