From nobody Fri Sep 22 15:07:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsbH15qwfz4v0gp; Fri, 22 Sep 2023 15:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsbH159Q1z3ZXB; Fri, 22 Sep 2023 15:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695395261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jhuGDJO0kgULudR6GLoYiHPZH+37VP1EpQzqWPlz80Q=; b=r68ykmzDEdDxYSs68Ashmvd1TtfpbKuEgCtSJT/bxR2vt48oO5ZRBqkBLFKKcTGZuP3llt pUbfePcaY/n2+jGGUZuBz7NRfw+1A1V87wRkhyC4LHXYi+5Eq2rGQj1Bj3Di89klYzslRH H7Yzm1/mL9HoAmqQVZlXGXQ9cA25iEJuu0gj3oT/yohJzglFFaWEOHm3FKKmGD+DoS2bV8 +dyqNkVjZfuBm5aLmURU/wUbONgL0fvmZoaLKn+AqCtm6WKSpNU+ZxL1lY+zhgCXO7MD5a 29sRJ/t/ZL/zr6Dkcj9ZBSBTKZOrmEER1EQVhP86oNO/SNvWGJqjxFLSCumnWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695395261; a=rsa-sha256; cv=none; b=uSkiLWKcrE80KfRLj4ceqovpy9fCUQOP57uX8LzubUvmHgbNxxYmI/GrQe5Pz/X8am1iCG ydqRorByMvlZvnVYEupGW3uApoXEZABlwyE/YzBRAq+s2AKZlj9HLrmrtpwvoqj73HR9ar 0qZKWAXuQ0CTutmA6xm3UFOl9S3CVd3I1BRKtN03legRUzng8FUVfTStxq+DsErb8wcI54 4K6uf/ukQJr8+EZfbIGG4hJQ5HqiiKTIfRW5R0cYA8vQ07DDt1Dl2XOPjtYca2YzXkpzpb qf4hA616nBK6kxk71GdaC78VtBlstS/rcuFLMT/qPodYwvaLMGDy5jlyxRr4kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695395261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jhuGDJO0kgULudR6GLoYiHPZH+37VP1EpQzqWPlz80Q=; b=m4NV3mzkBuq1Wf7wkd7cyBQb/tdbcT3qB94OUFvyTVybnHOVbi0pi8gHFOBt+rj4JJ/moD 6+qbHR1zjcD2D0x13G2wGJ8yNx6f5AQrtTsyoczgi3uMhuywl7TgIYqzjirPGQ4acAGw8b nG90tBmmo2bmNwPQd7gVdlosKcxGrq+PDmHYOX9PxN6Im2GpdMAX9xik2OJ4MKuGpMArb+ Oka0bNxjZAV62V/RRHypy2pZeF8nf4xBMsmviFXhLUWmXdPpFkfjkGslgkM6vNYnxkElmc tPieVYq1RA1ZAD8sHprpgn8DoS/7HMAf/N0y/w2++kFpn5neMk3suKXtFj+XFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsbH14H3SzBMF; Fri, 22 Sep 2023 15:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MF7fYm064225; Fri, 22 Sep 2023 15:07:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MF7fbv064222; Fri, 22 Sep 2023 15:07:41 GMT (envelope-from git) Date: Fri, 22 Sep 2023 15:07:41 GMT Message-Id: <202309221507.38MF7fbv064222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 53512a06abca - stable/13 - daemon.8: Sort options in DESCRIPTION List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 53512a06abca865da5844c101e7900a3a634849d Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=53512a06abca865da5844c101e7900a3a634849d commit 53512a06abca865da5844c101e7900a3a634849d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 18:40:23 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-22 15:07:28 +0000 daemon.8: Sort options in DESCRIPTION MFC after: 3 days (cherry picked from commit ee23e1e49666e2c6edd0e5d749d3562587dcb9a7) --- usr.sbin/daemon/daemon.8 | 96 ++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/usr.sbin/daemon/daemon.8 b/usr.sbin/daemon/daemon.8 index 87b9bec0b3e8..5ccf18566240 100644 --- a/usr.sbin/daemon/daemon.8 +++ b/usr.sbin/daemon/daemon.8 @@ -76,11 +76,28 @@ is received, for interoperability with and similar log rotation / archival mechanisms. If .Fl -output-file is not specified, this flag is ignored. -.It Fl S , Fl -syslog -Enable syslog output. -This is implicitly applied if other syslog parameters are provided. -The default values are daemon, notice, and daemon for facility, priority, and -tag, respectively. +.It Fl l , Fl -syslog-facility Ar syslog_facility +These facilities are accepted: +.Cm auth , authpriv , console , cron , daemon , +.Cm ftp , kern , lpr , mail , news , ntp , security , +.Cm syslog , user , uucp , +and +local facilities from +.Cm local0 +to +.Cm local7 . +The default is +.Cm daemon . +.It Fl m , Fl -output-mask Ar output_mask +Redirect output from the child process stdout +.Pq Cm 1 , +stderr +.Pq Cm 2 , +or both +.Pq Cm 3 . +This value specifies what is sent to syslog and the log file. +The default is +.Cm 3 . .It Fl o , Fl -output-file Ar output_file Append output from the daemonized process to .Pa output_file . @@ -93,66 +110,55 @@ the absolute path needs to be provided to ensure .Nm can re-open the file after a .Dv SIGHUP . -.It Fl m , Fl -output-mask Ar output_mask -Redirect output from the child process stdout -.Pq Cm 1 , -stderr -.Pq Cm 2 , -or both -.Pq Cm 3 . -This value specifies what is sent to syslog and the log file. -The default is -.Cm 3 . -.It Fl p , Fl -child-pidfile Ar child_pidfile -Write the ID of the created process into the -.Ar child_pidfile +.It Fl P , Fl -supervisor-pidfile Ar supervisor_pidfile +Write the ID of the +.Nm +process into the +.Ar supervisor_pidfile using the .Xr pidfile 3 functionality. The program is executed in a spawned child process while the .Nm waits until it terminates to keep the -.Ar child_pidfile +.Ar supervisor_pidfile locked and removes it after the process exits. The -.Ar child_pidfile +.Ar supervisor_pidfile owner is the user who runs the .Nm regardless of whether the .Fl -user option is used or not. -.It Fl P , Fl -supervisor-pidfile Ar supervisor_pidfile -Write the ID of the -.Nm -process into the -.Ar supervisor_pidfile +.It Fl p , Fl -child-pidfile Ar child_pidfile +Write the ID of the created process into the +.Ar child_pidfile using the .Xr pidfile 3 functionality. The program is executed in a spawned child process while the .Nm waits until it terminates to keep the -.Ar supervisor_pidfile +.Ar child_pidfile locked and removes it after the process exits. The -.Ar supervisor_pidfile +.Ar child_pidfile owner is the user who runs the .Nm regardless of whether the .Fl -user option is used or not. -.It Fl r , Fl -restart -Supervise and restart the program after a one-second delay if it has -been terminated. .It Fl R , Fl -restart-delay Ar restart_delay_seconds Supervise and restart the program after the specified delay if it has been terminated. -.It Fl t , Fl -title Ar title -Set the title for the daemon process. -The default is the daemonized invocation. -.It Fl u , Fl -user Ar user -Login name of the user to execute the program under. -Requires adequate superuser privileges. +.It Fl r , Fl -restart +Supervise and restart the program after a one-second delay if it has +been terminated. +.It Fl S , Fl -syslog +Enable syslog output. +This is implicitly applied if other syslog parameters are provided. +The default values are daemon, notice, and daemon for facility, priority, and +tag, respectively. .It Fl s , Fl -syslog-priority Ar syslog_priority These priorities are accepted: .Cm emerg , alert , crit , err , warning , @@ -161,22 +167,16 @@ and .Cm debug . The default is .Cm notice . -.It Fl l , Fl -syslog-facility Ar syslog_facility -These facilities are accepted: -.Cm auth , authpriv , console , cron , daemon , -.Cm ftp , kern , lpr , mail , news , ntp , security , -.Cm syslog , user , uucp , -and -local facilities from -.Cm local0 -to -.Cm local7 . -The default is -.Cm daemon . .It Fl T , Fl -syslog-tag Ar syslog_tag Set the tag which is appended to all syslog messages. The default is .Cm daemon . +.It Fl t , Fl -title Ar title +Set the title for the daemon process. +The default is the daemonized invocation. +.It Fl u , Fl -user Ar user +Login name of the user to execute the program under. +Requires adequate superuser privileges. .El .Pp If any of the options