From nobody Wed Nov 10 08:28:08 2021 X-Original-To: dev-commits-src-main@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 681AF183A994; Wed, 10 Nov 2021 08:28: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 4HpyfJ2SK3z3p0L; Wed, 10 Nov 2021 08:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 35E5D15801; Wed, 10 Nov 2021 08:28:08 +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 1AA8S8TE046206; Wed, 10 Nov 2021 08:28:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AA8S8QH046205; Wed, 10 Nov 2021 08:28:08 GMT (envelope-from git) Date: Wed, 10 Nov 2021 08:28:08 GMT Message-Id: <202111100828.1AA8S8QH046205@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dries Michiels Subject: git: e641c29a006a - main - UPDATING: Change update procedure to use etcupdate(8) over mergemaster(8) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: driesm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e641c29a006ae9f528f196386052355b42a53d75 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by driesm (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=e641c29a006ae9f528f196386052355b42a53d75 commit e641c29a006ae9f528f196386052355b42a53d75 Author: Dries Michiels AuthorDate: 2021-02-07 19:25:31 +0000 Commit: Dries Michiels CommitDate: 2021-11-10 08:18:42 +0000 UPDATING: Change update procedure to use etcupdate(8) over mergemaster(8) This commit aligns the steps in UPDATING with the steps from the handbook which already prefers etcupdate(8). While here also remove a dubious comment. PR: 252417 Reviewed by: ceri Approved by: philip (mentor), imp Differential Revision: https://reviews.freebsd.org/D28062 --- UPDATING | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/UPDATING b/UPDATING index bd79cda17aa3..f013826393fb 100644 --- a/UPDATING +++ b/UPDATING @@ -2463,9 +2463,9 @@ COMMON ITEMS: make installkernel KERNCONF=YOUR_KERNEL_HERE [1] [3] - mergemaster -Fp [5] + etcupdate -p [5] make installworld - mergemaster -Fi [4] + etcupdate -B [4] make delete-old [6] @@ -2501,9 +2501,9 @@ COMMON ITEMS: make installkernel KERNCONF=YOUR_KERNEL_HERE [1] [3] - mergemaster -Fp [5] + etcupdate -p [5] make installworld - mergemaster -Fi [4] + etcupdate -B [4] make delete-old [6] @@ -2545,15 +2545,11 @@ COMMON ITEMS: system. Attempting to do it by hand is not recommended and those that pursue this avenue should read this file carefully, as well as the archives of freebsd-current and freebsd-hackers mailing lists - for potential gotchas. The -U option is also useful to consider. - See mergemaster(8) for more information. + for potential gotchas. See etcupdate(8) for more information. [5] Usually this step is a no-op. However, from time to time you may need to do this if you get unknown user in the following - step. It never hurts to do it all the time. You may need to - install a new mergemaster (cd src/usr.sbin/mergemaster && make - install) after the buildworld before this step if you last updated - from current before 20130425 or from -stable before 20130430. + step. [6] This only deletes old files and directories. Old libraries can be deleted by "make delete-old-libs", but you have to make