Date: Tue, 3 May 2016 18:27:05 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414546 - in head/sysutils/daemontools: . files Message-ID: <201605031827.u43IR5Ln037347@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue May 3 18:27:04 2016 New Revision: 414546 URL: https://svnweb.freebsd.org/changeset/ports/414546 Log: rc.d/svscan: Use -f to daemon(8) again. - This reverts the change from r247267 which removed it. - The upstream svscanboot script closes stdout, stdin and stderr. Our script should do the same. Doing this does not lose any output since the output is all piped to the proper logger. This fixes hangs when combined with Salt [1]. Reported by: C. R. Oldham <cro@ncbt.org> [1] Modified: head/sysutils/daemontools/Makefile head/sysutils/daemontools/files/svscan.in Modified: head/sysutils/daemontools/Makefile ============================================================================== --- head/sysutils/daemontools/Makefile Tue May 3 18:00:32 2016 (r414545) +++ head/sysutils/daemontools/Makefile Tue May 3 18:27:04 2016 (r414546) @@ -3,7 +3,7 @@ PORTNAME= daemontools PORTVERSION= 0.76 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= sysutils MASTER_SITES= http://cr.yp.to/daemontools/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,1 \ Modified: head/sysutils/daemontools/files/svscan.in ============================================================================== --- head/sysutils/daemontools/files/svscan.in Tue May 3 18:00:32 2016 (r414545) +++ head/sysutils/daemontools/files/svscan.in Tue May 3 18:27:04 2016 (r414546) @@ -86,12 +86,12 @@ svscan_start () { EP="/usr/bin/env \ PATH=%%PREFIX%%/sbin:%%PREFIX%%/bin:/usr/sbin:/usr/bin:/sbin:/bin" if [ -z "${svscan_logdir}" ]; then - ${EP} /usr/sbin/daemon /bin/sh -c "$command $svscan_servicedir 2>&1 | %%PREFIX%%/bin/readproctitle service errors: ................................................................................................................................................................................................................................................................................................................................................................................................................ &" > /dev/null + ${EP} /usr/sbin/daemon -f /bin/sh -c "$command $svscan_servicedir 2>&1 | %%PREFIX%%/bin/readproctitle service errors: ................................................................................................................................................................................................................................................................................................................................................................................................................ &" else logmax=${svscan_logmax+s$svscan_logmax} lognum=${svscan_lognum+n$svscan_lognum} - ${EP} /usr/sbin/daemon /bin/sh -c "$command $svscan_servicedir 2>&1 \ - | %%PREFIX%%/bin/multilog t $logmax $lognum '${svscan_logdir}' &" > /dev/null + ${EP} /usr/sbin/daemon -f /bin/sh -c "$command $svscan_servicedir 2>&1 \ + | %%PREFIX%%/bin/multilog t $logmax $lognum '${svscan_logdir}' &" fi }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605031827.u43IR5Ln037347>