From nobody Tue May 16 21:34:35 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 4QLTyz3GsBz4BTfm; Tue, 16 May 2023 21:34:35 +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 4QLTyz2s8xz4P7x; Tue, 16 May 2023 21:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684272875; 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=+isLXM7j54dQLM1eNyP5fz7OvO9F3eUZqkO8b6AQ7Pw=; b=c05gpxNLg5d8dnInza+Hm1cTStqB5ZJOLL/7bE2iyNSTnlKrU2KtVJhW7WhctR4jdQVQfj WZGBkW4UdHNUcXFJm56rOwypCv7wczDTqUqv76Qaq7wNeHCY5n1bD0GSDbP0sOQvDBFQus lqYmRCOZyS/Aso14Mf0gVi3xmi7uFOARLR/Sqa+5s8/ZZsUfxMaNaVrfTtsGvyXUBh2Imw yaC+QCaFF8TouIFwOL1n4sgl0XDT0wpgbMcbYh4K9acmCOaKeePr/UOmBC+A6JBc6SDgRJ uZRLuZFqpImE8pG4TWicqtH+abhP1Dxxy7qPZXa22tUSlDF9DsodAeyuWteSvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684272875; 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=+isLXM7j54dQLM1eNyP5fz7OvO9F3eUZqkO8b6AQ7Pw=; b=SnVTreS6XWRtIf7Qz4RFsCnJKEJVm+Qm8QvXko0GwNMhnN8PliiakTWy84VvJ6JDLc4gwp dSozUA0qGBVEKvqJtxNhSUPJdcfBsAc6tUGUubH+otm0Uv9l3ykO2/iOPbt32+JMW42kfB CMLWw6Skoqjk3A/ThabHGHuKWI/5s+mQ/QA1DUotXBXnRagXsl41UbNwyLvtFYbTADhjUv t9850phFmHPP3+r2wbTjJWQaQy8EecHdEydg0oWGEx+/e4WDIKOoG9LS/tr9FCMUDhhDKO IxKCJJblOxpa7XjdNBv6RtU4U5y9sTPiIGYu4RHjXK3sG1992oB2RaL+4W9bBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684272875; a=rsa-sha256; cv=none; b=g0sCPH70Gy/RpP1gB0XYX+UPjU0scdn7bh83cMuvEUAWKizR1bd4nY/a0DiE+bFmNgfKbe fNJoFQhQxrhdq96oxHJ4zYysfn86hasGYTnI0zSYKbkHO3nGU1c/rpe7X41CHaM2G5Oeut I8ZYfhLnIoMFUXb/kWqKfLvC7g+5SdIYgu7F0fQgBrUjL+KT09vRxlWqkmTiw8vyuTXhBW BrgTKMmiYD6zwQF9D9ITCmNPAgx0fwoLGThoAc0o33YYQOWOBrZlWUgbriTvUbmm0xEX1H iV0VGEG9SC0nnIAbGUO97P97v8kfY/JhxpY6eI1QZpsILW9qwHb2eFDUIEobMQ== 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 4QLTyz1cXNzdnc; Tue, 16 May 2023 21:34:35 +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 34GLYZF6020339; Tue, 16 May 2023 21:34:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34GLYZ9I020338; Tue, 16 May 2023 21:34:35 GMT (envelope-from git) Date: Tue, 16 May 2023 21:34:35 GMT Message-Id: <202305162134.34GLYZ9I020338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 866e5c6b3ce7 - stable/13 - freebsd-update: Fix merging already-updated files 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 866e5c6b3ce7ca3e15a24180fa1a0dcbda7c4b0f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=866e5c6b3ce7ca3e15a24180fa1a0dcbda7c4b0f commit 866e5c6b3ce7ca3e15a24180fa1a0dcbda7c4b0f Author: Colin Percival AuthorDate: 2023-05-05 03:00:58 +0000 Commit: Colin Percival CommitDate: 2023-05-16 21:34:10 +0000 freebsd-update: Fix merging already-updated files When performing an "upgrade" (moving between FreeBSD releases, as opposed to "update" which merely applies security/errata updates to the installed release) FreeBSD Update: 1. Generates a list of "files needing to be merged", namely those files which don't match the version installed in the "old" release and have paths matching the MergeChanges configuration directive (by default, /boot/device.hints and everything under /etc/). and later on, 2. Compares the currently-installed files to the versions in the "new" release, removing index entries for files which "don't need to be updated because they're not changing". Unfortunately if a file falls into both of these categories -- that is to say, if a file in /etc/ is the same as the version in the new release and not the same as the version in the old release -- the resulting "merge" step saw that the file was no longer listed as being part of the new release, resulting in the file being deleted. For the first 18 years of FreeBSD Update's existence, this never happened, since $FreeBSD$ tags resulted in "new release" files always being different from any files systems would already have installed. This commit fixes this behaviour by only placing a file into the "files needing to be merged" list if it does not match the version in the old release *or* the version in the new release. Reported by: des Reviewed by: delphij (earlier version), des, emaste MFC after: 7 days X-EN-Candidate: yes Differential Revision: https://reviews.freebsd.org/D39973 (cherry picked from commit c55b7e522629cb78adeb54bd9964304481d55eab) --- usr.sbin/freebsd-update/freebsd-update.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 4ef44d1ad000..4f779270926d 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1677,11 +1677,12 @@ fetch_inspect_system () { echo "done." } -# For any paths matching ${MERGECHANGES}, compare $1 and $2 and find any -# files which differ; generate $3 containing these paths and the old hashes. +# For any paths matching ${MERGECHANGES}, compare $2 against $1 and $3 and +# find any files with values unique to $2; generate $4 containing these paths +# and their corresponding hashes from $1. fetch_filter_mergechanges () { # Pull out the paths and hashes of the files matching ${MERGECHANGES}. - for F in $1 $2; do + for F in $1 $2 $3; do for X in ${MERGECHANGES}; do grep -E "^${X}" ${F} done | @@ -1689,9 +1690,10 @@ fetch_filter_mergechanges () { sort > ${F}-values done - # Any line in $2-values which doesn't appear in $1-values and is a - # file means that we should list the path in $3. - comm -13 $1-values $2-values | + # Any line in $2-values which doesn't appear in $1-values or $3-values + # and is a file means that we should list the path in $3. + sort $1-values $3-values | + comm -13 - $2-values | fgrep '|f|' | cut -f 1 -d '|' > $2-paths @@ -1703,10 +1705,10 @@ fetch_filter_mergechanges () { while read X; do look "${X}|" $1-values | head -1 - done < $2-paths > $3 + done < $2-paths > $4 # Clean up - rm $1-values $2-values $2-paths + rm $1-values $2-values $3-values $2-paths } # For any paths matching ${UPDATEIFUNMODIFIED}, remove lines from $[123] @@ -2711,7 +2713,7 @@ upgrade_run () { # Based on ${MERGECHANGES}, generate a file tomerge-old with the # paths and hashes of old versions of files to merge. - fetch_filter_mergechanges INDEX-OLD INDEX-PRESENT tomerge-old + fetch_filter_mergechanges INDEX-OLD INDEX-PRESENT INDEX-NEW tomerge-old # Based on ${UPDATEIFUNMODIFIED}, remove lines from INDEX-* which # correspond to lines in INDEX-PRESENT with hashes not appearing