Date: Fri, 9 May 2014 15:55:45 +0000 (UTC) From: Jaakko Heinonen <jh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r265781 - stable/10/usr.sbin/daemon Message-ID: <201405091555.s49FtjPI027558@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jh Date: Fri May 9 15:55:45 2014 New Revision: 265781 URL: http://svnweb.freebsd.org/changeset/base/265781 Log: MFC r264194: Fork a child process and wait until the process terminates when the -P option is specified. This behavior is documented on the manual page. PR: bin/187265 Modified: stable/10/usr.sbin/daemon/daemon.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/daemon/daemon.c ============================================================================== --- stable/10/usr.sbin/daemon/daemon.c Fri May 9 14:35:07 2014 (r265780) +++ stable/10/usr.sbin/daemon/daemon.c Fri May 9 15:55:45 2014 (r265781) @@ -139,7 +139,7 @@ main(int argc, char *argv[]) * get SIGCHLD eventually. */ pid = -1; - if (pidfile != NULL || restart) { + if (pidfile != NULL || ppidfile != NULL || restart) { /* * Restore default action for SIGTERM in case the * parent process decided to ignore it.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405091555.s49FtjPI027558>