From nobody Thu Feb 24 13:48:18 2022 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 3849E19E7B21; Thu, 24 Feb 2022 13:48:19 +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 4K4Dkp6pgFz4crF; Thu, 24 Feb 2022 13:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645710499; 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=xxPUgdFqqrTWn6bx3RQWgAh83QNU1V2b5wo+ug/+ySI=; b=Cesd8xDFkV0luIXrsIVgisgLSnTRiiq9RYxXka//cT4CfdqPcaQrOHT2X1vG/eIiC6Hgw8 eEQkRpqI0FdMeTdvD9T0rnVX9CW7o+al8esUA4wVGhklf3OOJJgvDQbsJzk9Ygu5Bgl+12 aRhPCRaoSo4mHgFXbHkmVjGMwx9HMAcxZ0Y4VrRRL7FnCCUBhhaQ8CDRaGE7mY1IL3E1fS PyzZ7J+ru3a05me+zj4lcAfT8i7v0MnMGMIRmZjXoPtH+9zruQA3ktzKTU8vlESvtAx94w xAN9TetGVxoI1Q53ld65IPjzS33QmVIsOztNki3gE0bXY7U53jOaqP7p0AWXhA== 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 9DD9E519D; Thu, 24 Feb 2022 13:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21ODmI3b097682; Thu, 24 Feb 2022 13:48:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21ODmI2m097681; Thu, 24 Feb 2022 13:48:18 GMT (envelope-from git) Date: Thu, 24 Feb 2022 13:48:18 GMT Message-Id: <202202241348.21ODmI2m097681@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: 62947ebdf7ba - stable/13 - freebsd-update.conf.5: Sort options 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/13 X-Git-Reftype: branch X-Git-Commit: 62947ebdf7ba656eba2118087134e85133f0b489 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645710499; 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=xxPUgdFqqrTWn6bx3RQWgAh83QNU1V2b5wo+ug/+ySI=; b=Py0tpI/OgdBZbX8wdI5AwyYYpEnnrhm63FtxHOj+0UScTwD1WuT5fsgo3iwMa9sQHLT7Ai U2sQLcR/uKj/QGWLhFH6KOzUWAWQGfZDZ2w4FRbUALN8jhDPHTcrlGVJOlJ5bVWnS8SoTe zLxwgwQy8+hLWpPWGOLO/sepyg9dsFAlzYRgsnmoonvpKpjYcgjZEtMT4mJuZT2RnDjSV3 m6xCI9VleDxnxQN/v43NhCaBRwKmpLq9HkUCqcaFNq2AKjJZ20tqd6HQYWGyANCE8GmqG9 706N1bQT7DpWkq3vJ3An7wXtgi4EoA2eSEoaaY7IWC0SQH5QptO6/282q2hGiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645710499; a=rsa-sha256; cv=none; b=lWh984NBH4wDcJKh6RduWLITW7JMui8sgHHyFzlz+6zS/sE+FUifpOg+h24IF3p8heEy52 /sEdlkxfwXWXlPXQpSWknndS49fRFq02RV6ugUpXL2TORbAnIVHSdp1oXdL9NfMMsLvkaT N6pcMdRmfuOf4inQm1b7D75ZcNm7YKvbWfZyMh6qtuHYI12ef5e9kUn5fCg770UXn+f7iN HUWvgvvLuW7aYa5UdWv/tmsRl0mK3dlzE3AopxQPhVeTRsH7Qbc88hGK/fuKNJAuNRBJ79 l71Npc+k8TRLMkfeq75q321eRFLEzW8vaiv8wDwtObv2Pcr053Ffp9JjLWTP8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=62947ebdf7ba656eba2118087134e85133f0b489 commit 62947ebdf7ba656eba2118087134e85133f0b489 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-02-17 09:54:07 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-02-24 13:48:01 +0000 freebsd-update.conf.5: Sort options Reported by: pauamma_gundo.com MFC after: 1 week (cherry picked from commit bf8e97858365fe121968445c593dd4128d5f5490) --- share/man/man5/freebsd-update.conf.5 | 202 +++++++++++++++++------------------ 1 file changed, 101 insertions(+), 101 deletions(-) diff --git a/share/man/man5/freebsd-update.conf.5 b/share/man/man5/freebsd-update.conf.5 index 76782dd1c095..f03cdb1e8b8f 100644 --- a/share/man/man5/freebsd-update.conf.5 +++ b/share/man/man5/freebsd-update.conf.5 @@ -48,80 +48,6 @@ error. .Pp The possible options and their meanings are as follows: .Bl -tag -width "BackupKernelSymbolFiles" -.It Cm KeyPrint -The single parameter following this keyword is the SHA256 hash -of the RSA key which will be trusted to sign updates. -.It Cm ServerName -The single parameter following this keyword is the name of the -server or server pool from which updates will be downloaded. -.It Cm Components -The parameters following this keyword are the components or -sub-components of -.Fx -which will be updated. -The components are -.Dq src -(source code), -.Dq world -(non-kernel binaries), and -.Dq kernel ; -the sub-components are the individual distribution sets generated as -part of the release process (e.g., -.Dq src/base , -.Dq src/sys , -.Dq world/base , -.Dq world/catpages , -.Dq kernel/smp ) . -Note that prior to -.Fx 6.1 , -the -.Dq kernel -component was distributed as part of -.Dq world/base . -.Pp -This option can be specified multiple times, and the parameters -accumulate. -.It Cm IgnorePaths -The parameters following this keyword are regular expressions; -updates to paths which start with a string matching one of -these regular expressions will be ignored. -.Pp -This option can be specified multiple times, and the parameters -accumulate. -.It Cm IDSIgnorePaths -The parameters following this keyword are regular expressions; -paths which start with a string matching one of these regular -expressions will be ignored by -.Xr freebsd-update 8 -IDS. -.Pp -This option can be specified multiple times, and the parameters -accumulate. -.It Cm UpdateIfUnmodified -The parameters following this keyword are regular expressions; -updates to paths which start with a string matching one of -these regular expressions will be ignored if the files have -been modified locally (unless they are merged \(em see the -.Cm MergeChanges -option). -.Pp -This option can be specified multiple times, and the parameters -accumulate. -.It Cm MergeChanges -The parameters following this keyword are regular expressions; -updates to paths which start with a string matching one of -these regular expressions will be merged with local modifications. -.Pp -This option can be specified multiple times, and the parameters -accumulate. -.It Cm WorkDir -The single parameter following this keyword is the directory -in which temporary files and downloaded updates will be stored. -.It Cm MailTo -The single parameter following this keyword is the address -to which -.Xr cron 8 -output will be mailed. .It Cm AllowAdd The single parameter following this keyword must be .Dq yes @@ -146,33 +72,6 @@ and specifies whether .Xr freebsd-update 8 is allowed to delete files, directories, and symlinks as part of updates downloaded. -.It Cm KeepModifiedMetadata -The single parameter following this keyword must be -.Dq yes -or -.Dq no -and specifies whether -.Xr freebsd-update 8 -should keep existing file ownership, permissions, and flags -when installing updates if these have been modified locally. -.It Cm StrictComponents -The single parameter following this keyword must be -.Dq yes -or -.Dq no -and specifies whether -.Xr freebsd-update 8 -should interpret the list of components of -.Fx -specified via the -.Cm Components -option strictly as a list of components installed which -should be upgraded when the -.Cm upgrade -command is used ("yes"), or merely as a list of components -which might be installed, of which -.Xr freebsd-update 8 -should identify which in fact are present ("no"). .It Cm BackupKernel The single parameter following this keyword must be .Dq yes @@ -221,6 +120,33 @@ backup kernel, the .Xr freebsd-update 8 rollback command will recreate the symbol files along with the old kernel. +.It Cm Components +The parameters following this keyword are the components or +sub-components of +.Fx +which will be updated. +The components are +.Dq src +(source code), +.Dq world +(non-kernel binaries), and +.Dq kernel ; +the sub-components are the individual distribution sets generated as +part of the release process (e.g., +.Dq src/base , +.Dq src/sys , +.Dq world/base , +.Dq world/catpages , +.Dq kernel/smp ) . +Note that prior to +.Fx 6.1 , +the +.Dq kernel +component was distributed as part of +.Dq world/base . +.Pp +This option can be specified multiple times, and the parameters +accumulate. .It Cm CreateBootEnv The single parameter following this keyword must be .Dq yes @@ -275,6 +201,80 @@ or jail .Pq Fl j flags. .El +.It Cm IDSIgnorePaths +The parameters following this keyword are regular expressions; +paths which start with a string matching one of these regular +expressions will be ignored by +.Xr freebsd-update 8 +IDS. +.Pp +This option can be specified multiple times, and the parameters +accumulate. +.It Cm IgnorePaths +The parameters following this keyword are regular expressions; +updates to paths which start with a string matching one of +these regular expressions will be ignored. +.Pp +This option can be specified multiple times, and the parameters +accumulate. +.It Cm KeepModifiedMetadata +The single parameter following this keyword must be +.Dq yes +or +.Dq no +and specifies whether +.Xr freebsd-update 8 +should keep existing file ownership, permissions, and flags +when installing updates if these have been modified locally. +.It Cm KeyPrint +The single parameter following this keyword is the SHA256 hash +of the RSA key which will be trusted to sign updates. +.It Cm MailTo +The single parameter following this keyword is the address +to which +.Xr cron 8 +output will be mailed. +.It Cm MergeChanges +The parameters following this keyword are regular expressions; +updates to paths which start with a string matching one of +these regular expressions will be merged with local modifications. +.Pp +This option can be specified multiple times, and the parameters +accumulate. +.It Cm ServerName +The single parameter following this keyword is the name of the +server or server pool from which updates will be downloaded. +.It Cm StrictComponents +The single parameter following this keyword must be +.Dq yes +or +.Dq no +and specifies whether +.Xr freebsd-update 8 +should interpret the list of components of +.Fx +specified via the +.Cm Components +option strictly as a list of components installed which +should be upgraded when the +.Cm upgrade +command is used ("yes"), or merely as a list of components +which might be installed, of which +.Xr freebsd-update 8 +should identify which in fact are present ("no"). +.It Cm UpdateIfUnmodified +The parameters following this keyword are regular expressions; +updates to paths which start with a string matching one of +these regular expressions will be ignored if the files have +been modified locally (unless they are merged \(em see the +.Cm MergeChanges +option). +.Pp +This option can be specified multiple times, and the parameters +accumulate. +.It Cm WorkDir +The single parameter following this keyword is the directory +in which temporary files and downloaded updates will be stored. .El .Sh FILES .Bl -tag -width "/etc/freebsd-update.conf"