From nobody Wed Oct 18 14:54:01 2023 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 4S9YlF4vfXz4x7R6; Wed, 18 Oct 2023 14:54:01 +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 4S9YlF4Jglz3b9s; Wed, 18 Oct 2023 14:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640841; 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=8ZvahCM05lpcnWkkowY2vGguw/ZqNkR+QgCI3PAoxQQ=; b=kM6SvDW8HyYNavLqbDiHV9ZdLiuLR1BCmNoEKwKvP4PkR3Z9qarTHGn5ec6/IN3A5y7AWz NmrIO64E3KctjaEq6Zvhlog8Q9Ewuw8D0lQVC39TwEKzRsfXzXc4ZAsi5j5nS2DHGjIhM4 8am3bxDP2fkG+oo4p6qPD+gcbwDSvQYzvFgHxY0Gi/fYyfbynHBatGmhr6XLYIZYPAl37Z ClcBKt0MjOUlo/qtwRlZgyxppb7Bf5EBkVfePA7Dx1XErXP6Fk1t1fffHY+/UhCtMnOb+2 zTJksX6lf7xpCk2GFyEzeqV1fibPgUXN7d4FiNsbrRf7FW5JVPBq7IQnsMEivg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697640841; a=rsa-sha256; cv=none; b=RHF9i09y7+1ZEqQB3dLWG+rZaofYsyxF1TU/tTcKYNPLvCd4i/HSKqLVqc+wtMykV93SIw kBb6JC50vc7hevU6qCDceFz9IaDMB2eTRM9yPaCc+LnRjUtAI2nQ/21EnfVsSrR2DUTE2q +1Dddw6neWCv23AzwQYiXIk+t0N4iJAVGGRImV1QU9mW3oJxckyKAeUgoLTR54LcOEB5PD 0m4mVh8ppfpvEHsQ4WyV1+6XgV5unb+Z/BkbWds4ttjnEWsKB56Bi5JbkAs/RwMVS27qcq OZ2nQNzjFFNaW0rBDzvIBcujVcIpjUK2HGkfIqdyvrkSmtvT9w7k2mLSHtIvtw== 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=1697640841; 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=8ZvahCM05lpcnWkkowY2vGguw/ZqNkR+QgCI3PAoxQQ=; b=PYLvuKttg6nhqWiKNUUa8WGO8yxr/KlwJ/tV6fsqd+WG+ahLqpJdNf99MMPprPmoGhcqGg e30+gyi1FsL68VBDv/NG/o30M0LByyH6vSeC/H+DOgJwKwQT5y6ekcS/zyqXiRZqUK2qZ5 bVsgc+KpiH/p2ih/Fb/Zlr0Mhl34kn7KhIhLit8A0Uu734DNdpjSLrmu3r/AJWtY8EnyJu GjLPYWUrDI7CV0kwC/NOeTvAcgL3/yniMscHdF/dPts3p0cDhD4Zg9sqR/N8fw/UvCKawD hSEcQEV4caDRddupr4hFNdTAT/TKFJediwTmQDt3X2y2fYeKjkYGjg5qi7c1Xw== 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 4S9YlF3Bkbz19Nf; Wed, 18 Oct 2023 14:54:01 +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 39IEs1ZW026484; Wed, 18 Oct 2023 14:54:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEs1wP026481; Wed, 18 Oct 2023 14:54:01 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:54:01 GMT Message-Id: <202310181454.39IEs1wP026481@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6b27e1f2eaab - main - freebsd-update: for rollback, first create directories 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b27e1f2eaab9360a796c943da9d206515e1742b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6b27e1f2eaab9360a796c943da9d206515e1742b commit 6b27e1f2eaab9360a796c943da9d206515e1742b Author: Ed Maste AuthorDate: 2023-09-29 15:28:35 +0000 Commit: Ed Maste CommitDate: 2023-10-18 14:52:59 +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 --- 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 30e78f9bffa2..4866514c321e 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3191,6 +3191,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 |