From nobody Wed Apr 17 17:06:36 2024 X-Original-To: dev-commits-doc-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 4VKS4D4qR1z5HFyr for ; Wed, 17 Apr 2024 17:06:36 +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 4VKS4D3vf2z3yfq; Wed, 17 Apr 2024 17:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713373596; 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=7lhDp7fZ05wkPw6d0j+ZPq95N2vdUWqIMnY5g2xzRsQ=; b=KoO+hcS8AG1pNKVQHNuR0U2Vu9gsy1VwSWW+kHzpMsUsrPiTgy/xNtMolpNQJvDLxF1522 OTdZtmh/s69IFhy/WLCiS9YfOohAm0ou/EDVjAZOCkUs40NgG05daAxpHeThXJl3j4r5hZ SjMXX147Q2K+6cRGxfGIlUSQOAGnDqJjoGzaXPuhRdQ7CKmcMqcRcfIbC6cPoIpuP3zciM CynfUQLk0UrdOD+DsXPTvhcwnCePk84Clvsg+DhrsZDPyGQz/ofB06GMMnodJT2cB4W7Q+ UOoVDv5xNeV/1sVTdgqXPmAXg68qZcsmDHjZvZJ1h7T/cjIl6aaOp1VMhi5uFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713373596; a=rsa-sha256; cv=none; b=n0HgyPO4RuO7WTBGQRBd/q1SXSEnmtVpTSAvjQa0vwOQpu0ckGQm+nRrUlfD+ysDLuqaBI pVssckSb11u3bgo3TIqZNFHMFo2dZa8G/Flq6BspXNPqgbQN+fnWrIMIaDYnckha7qwNOX if4xQe+igO/42QXq2j3ixThFobButhq/Pl5kQWVG7ejxqOn9WWGTGbqBOb65bD/+hiP8W/ fXOlMBVqTmPhWPOV0nrT0CBEKMQsIgLfnRWqB+rISrQJaWteGX/6MpY41qNGtlyBLjrqCt R+0M8KY5bjRGz2byI7PwtODPU6oAeUMKq+TrysFn7VlGtIv1b9YXJ4DL9BuKjw== 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=1713373596; 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=7lhDp7fZ05wkPw6d0j+ZPq95N2vdUWqIMnY5g2xzRsQ=; b=wRlETWOyWkqUIzyp2uhasvPIyMbdb0tijfO6oMNvkMfgApTeaDbWcv3WeJ5Rd6NxaGFK2f O6gM02RO0bl+ZQMdBjNeXB2ADMNp/y43XkJ/XQ+UnfpQVikeeOb/cvfI5/cy5tVH7ZwVau Ur+eKgZAeqdreZFkkD2XN2Aq+tDywGvoj6CYMoKv/Aon48mtMVPQQkG6kC9kWTfkS6z1bO XSPmYwByzrINxEo7SjD9udQIE8/toLJWxcRjvc9+CMpu01UvwxK9JHbvLtviMaC1GlCMms mrw51b3rPJGKL6GREObukx+2Wu6eP4PatUGbZAPuOFUyY60GRYktcbWu6LMBbg== 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 4VKS4D3NyJzbDr; Wed, 17 Apr 2024 17:06:36 +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 43HH6ak5060024; Wed, 17 Apr 2024 17:06:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HH6aMf060021; Wed, 17 Apr 2024 17:06:36 GMT (envelope-from git) Date: Wed, 17 Apr 2024 17:06:36 GMT Message-Id: <202404171706.43HH6aMf060021@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ed Maste Subject: git: e5f0ee69e6 - main - handbook: Remove mergemaster usage in update process List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5f0ee69e64a568dab4ee71d994d6231c79f6b21 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/doc/commit/?id=e5f0ee69e64a568dab4ee71d994d6231c79f6b21 commit e5f0ee69e64a568dab4ee71d994d6231c79f6b21 Author: Minsoo Choo AuthorDate: 2024-04-17 16:41:18 +0000 Commit: Ed Maste CommitDate: 2024-04-17 17:06:09 +0000 handbook: Remove mergemaster usage in update process PR: 252417 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43119 --- .../en/books/handbook/cutting-edge/_index.adoc | 29 +++------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/documentation/content/en/books/handbook/cutting-edge/_index.adoc b/documentation/content/en/books/handbook/cutting-edge/_index.adoc index faf17907cb..00997b38aa 100644 --- a/documentation/content/en/books/handbook/cutting-edge/_index.adoc +++ b/documentation/content/en/books/handbook/cutting-edge/_index.adoc @@ -146,10 +146,9 @@ MergeChanges /etc/ /var/named/etc/ /boot/device.hints .... List of directories with configuration files that `freebsd-update` should attempt to merge. -The file merge process is a series of man:diff[1] patches similar to man:mergemaster[8], but with fewer options. +The file merge process is a series of man:diff[1] patches. Merges are either accepted, open an editor, or cause `freebsd-update` to abort. When in doubt, backup [.filename]#/etc# and just accept the merges. -See man:mergemaster[8] for more information about `mergemaster`. [.programlisting] .... @@ -985,7 +984,7 @@ Any modified configuration files are merged with the new versions, outdated libr man:etcupdate[8] is a tool for managing updates to files that are not updated as part of an installworld such as files located in [.filename]#/etc/#. It manages updates by doing a three-way merge of changes made to these files against the local versions. -It is also designed to minimize the amount of user intervention, in contrast to man:mergemaster[8]'s interactive prompts. +man:etcupdate[8] is designed to minimize the amount of user intervention. [NOTE] ==== @@ -1023,28 +1022,6 @@ To prevent this, perform the following steps *before* updating sources and build <.> Check the diff after bootstrapping. Trim any local changes that are no longer needed to reduce the chance of conflicts in future updates. ==== -[[updating-src-completing-merge-mergemaster]] -==== Merging Configuration Files with man:mergemaster[8] - -man:mergemaster[8] provides a way to merge changes that have been made to system configuration files with new versions of those files. -man:mergemaster[8] is an alternative to the preferred man:etcupdate[8] -With `-Ui`, man:mergemaster[8] automatically updates files that have not been user-modified and installs new files that are not already present: - -[source,shell] -.... -# mergemaster -Ui -.... - -If a file must be manually merged, an interactive display allows the user to choose which portions of the files are kept. -See man:mergemaster[8] for more information. - -If the standard [.filename]#/usr/src# was not used, another parameter must be passed to man:mergemaster[8]: - -[source,shell] -.... -# mergemaster -Ui PATH_TO_SRC -.... - [[updating-src-completing-check-old]] ==== Checking for Outdated Files and Libraries @@ -1136,7 +1113,7 @@ On the build machine, build the kernel and world as described in <>, but do not install anything on the build machine. Instead, install the built kernel on the test machine. On the test machine, mount [.filename]#/usr/src# and [.filename]#/usr/obj# via NFS. -Then, run `shutdown now` to go to single-user mode in order to install the new kernel and world and run `mergemaster` as usual. +Then, run `shutdown now` to go to single-user mode in order to install the new kernel and world and run `etcupdate` as usual. When done, reboot to return to normal multi-user operations. After verifying that everything on the test machine is working properly,