From nobody Sun Jan 07 21:25:54 2024 X-Original-To: dev-commits-src-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 4T7Vc268MRz5624Q; Sun, 7 Jan 2024 21:25:54 +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 4T7Vc23rQQz48tq; Sun, 7 Jan 2024 21:25:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704662754; 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=aPAGGlcDMq810Sw0jVhueQZnv8v7imhTqavJt+rAvJ8=; b=ovNmgjiZpqaWde63KJbMxyXzefPnMWilwRI1UMZZk+gxNziG57gQaa4upv+FEA8vR5H/2Y iICLOs8YSbk/54Ntnm+mko+XYO7rMcRFs7wBHflrDAnJvJ0ECKBMo1LqnDT7OwzZIxIGFE 7+dAG+UY9a6iQ3z4LveAUG0DhnvyXlTDtO7dU4/H2sE5e8x886tdkAmv7iw/Rg8R6fmI/U 2szwRZXDeVv67Bz1Ct+sU71aBkISf1W2XlyRhU+OTXiUAHTBX9LJhoPYfwZjRdoLflnaZV H5UfPBweZgcLSBgiEPureNj7LRy1+IJCm6RUA60+OtYDWBG21VOWKMOXOYWO/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704662754; 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=aPAGGlcDMq810Sw0jVhueQZnv8v7imhTqavJt+rAvJ8=; b=nWJPCuRi3hXpLHPBTiV9BDjliagIGQrRx/2ewspCPZJTjsBxm5CkQlO/T+Ztrd39prDEWu 2auyUCQXCK0QetzbaPKKUy4z53yWb8Wb1CIJl0nt/TDNv6L5qeV1xkS2Xb7sBdQ4qGnIRo yyXynaNf1DSIGPDPOkmEC4ER0OscoO15Efbl+8tgATUjcF8vFGYvco0fytcSyc/B33K6EI 3JSSklzV5tyDoyIhHyUvEBz7BmGQaURqRRfAOaP+deW5Afv33xQEphRUYB5hz/Ll62cYKw dUsGmOu9iiZnwhipoc0SE41BJhg203pvW0lYmK2qI7Q2NkvwQgCLlTS4eB88zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704662754; a=rsa-sha256; cv=none; b=D6XAsgAsgHmQwKXTFfUJMWWc2m/7W3jgTM9CufLQj4M2GO1+lcw1VnyxqCbpULhjN2Ab4o AmiMjB4z3tpzv9QOJuTw00uEdfOULlzrilDMUrGCTGlay5XdPyQTAWG5whjif1mm3V6TjQ K4//iGlEvQh8rc9Y4QDGvLRXFmbuSI30mkzd2ZNmJUxsxrkAtJyuxWd+yvec+d1kpmDkT6 zkUkW0C9EDSfeG2YYLm0Yj2SjdWrCL69to4KjA97ePSPblVZYp/6leLR2CzXnnHuDbohSC IrgORE24LVbOnZscUqq4xQt1OtkQk1uWkr7Wgfknb8sxfQNDg/CS6wnrtqTuQg== 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 4T7Vc22RXxzgjj; Sun, 7 Jan 2024 21:25:54 +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 407LPsgV084088; Sun, 7 Jan 2024 21:25:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407LPsIN084085; Sun, 7 Jan 2024 21:25:54 GMT (envelope-from git) Date: Sun, 7 Jan 2024 21:25:54 GMT Message-Id: <202401072125.407LPsIN084085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ec5e6781b3a1 - stable/13 - freebsd-update: for rollback, first create directories List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-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: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ec5e6781b3a1a3216535bc9aeedd746449cee6e6 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ec5e6781b3a1a3216535bc9aeedd746449cee6e6 commit ec5e6781b3a1a3216535bc9aeedd746449cee6e6 Author: Ed Maste AuthorDate: 2023-09-29 15:28:35 +0000 Commit: Ed Maste CommitDate: 2024-01-07 20:41:48 +0000 freebsd-update: for rollback, first create directories rollback_files() tried to install files before creating the directories for those files. In some cases this is due to special handling to install certain classes of files earlier than others. Just create all directories up front when performing rollback. PR: 273950 Reviewed by: dim Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42020 (cherry picked from commit 6b27e1f2eaab9360a796c943da9d206515e1742b) (cherry picked from commit 2b79df0ad999df4bc22ed0e1eff446efa4055359) --- usr.sbin/freebsd-update/freebsd-update.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 7408ef1c6721..551d40418240 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3196,6 +3196,11 @@ rollback_setup_rollback () { # Install old files, delete new files, and update linker.hints rollback_files () { + # Create directories first. They may be needed by files we will + # install in subsequent steps (PR273950). + awk -F \| '{if ($2 == "d") print }' $1/INDEX-OLD > INDEX-OLD + install_from_index INDEX-OLD || return 1 + # Install old shared library files which don't have the same path as # a new shared library file. grep -vE '^/boot/' $1/INDEX-NEW |