From owner-svn-ports-all@freebsd.org Tue May 3 18:27:06 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2FC08B2AA87; Tue, 3 May 2016 18:27:06 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E57CE18A9; Tue, 3 May 2016 18:27:05 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u43IR5Eo037349; Tue, 3 May 2016 18:27:05 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u43IR5Ln037347; Tue, 3 May 2016 18:27:05 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201605031827.u43IR5Ln037347@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 3 May 2016 18:27:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414546 - in head/sysutils/daemontools: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 May 2016 18:27:06 -0000 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 [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 }