From nobody Fri Sep 22 12:44:08 2023 X-Original-To: dev-commits-src-branches@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 4RsX5N5xCyz4tqNn; Fri, 22 Sep 2023 12:44:08 +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 4RsX5N4zGCz3K7B; Fri, 22 Sep 2023 12:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695386648; 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=vwVuZWvxdQXxOTx73YxJvetdZ/IGijlcUUUtzneLVrg=; b=IgJJk/mXhpbAkGSfq35odLiFaMYsIZ9kCYgyJuwC+M3n8Vqf3V+64FM7qFtoESGseCO8DZ OGR63J4ZN3R5u9h0oED8BWQQ5hexOMTG5/pJHcMpPsyNuCoBMfWuIsYKBXN9s+G7tdaDWg G8Jmri7CdrsszJR2EAW8Hx6NWJkSK5Ubw5AymBnZ2yu+Hr0g6LkcWkklsYXm0mapj+yynO o3aLRCbhnFxUD5r7Bam9eOQrldZZVq/KF+WlLXvtT3sIs7ZCxGsNkt7MOCQf2tktJcE4io 3glmDZYiPskSxXJFJ5+4EOm4GqftI/TWsBqNmg6oeNgVlYQcUqbwFrzykC0aIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695386648; a=rsa-sha256; cv=none; b=XkSbDS0iPq/CjezsMZ9F+2w/ugmXktyfJPMwPPI0AxtVAfmuRY2au0B7+Dp9+WM+lGIzz9 Mrezk5U0IyE/Fz94/h56QEqZHYKvb+mpdkjvqCys/o1+/WrfdoiKiw0iZOv62Xb78uBmmv lJRIXfcAHVTK9nlVIdYVetVZmOR6D6ynK7WOlMrFAqB265CHzCtmDtZAcJjRguDdIBrRwX PbkGmZQrRK0av+hYMuLtuxkFhZSJlozVRp9xQKEIeu7AFr37Jbji3HMgJEz1ugOrlrR6lj ItA1hi1Htl3fwuXMCHA1YQDFFdVY9643I782MT+v7EqTyN/uglYuP2DElHfvRg== 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=1695386648; 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=vwVuZWvxdQXxOTx73YxJvetdZ/IGijlcUUUtzneLVrg=; b=iOtCiUQJph6kHwbhaqBBtZs7O3nw6Bem00iOVE9M1P7ApBeJS0yuMjMdKFsS3kIvFgwwdb C8w5cdF1L4/uwsZObz7UuCGRBCmTwX1oAlD+Qxjcabo+4vECNvTdmmjVG8Exhgbj9c9n4y hRPAQIEFtpg0UQ+ja5lASubZ64r/oQY0BwWd9bbWn7UvwWmyjNdyBHf9kIe8wphNvd7hfF 8PXbpOQyzwmapg2jTOcy5+lx17igzgnxY8tqjStgl3gkftpzl2d2Q1c65Ud1huTKt3/HV1 M1/3NMv+dqKR4IytYxs56hid5/EQzuw0xfF2y6WH9CEHN478cNUwi2ab6DOA8Q== 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 4RsX5N44m2z74k; Fri, 22 Sep 2023 12:44:08 +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 38MCi8m1030722; Fri, 22 Sep 2023 12:44:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MCi8Gn030719; Fri, 22 Sep 2023 12:44:08 GMT (envelope-from git) Date: Fri, 22 Sep 2023 12:44:08 GMT Message-Id: <202309221244.38MCi8Gn030719@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: 498aa9b2bf48 - stable/14 - daemon.8: Sort options in DESCRIPTION List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 498aa9b2bf4859a96d54bd41f658de48667b01a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=498aa9b2bf4859a96d54bd41f658de48667b01a2 commit 498aa9b2bf4859a96d54bd41f658de48667b01a2 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 18:40:23 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-22 12:41: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