From nobody Mon Jan 8 14:46:16 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 4T7xhT43NHz55wgf; Mon, 8 Jan 2024 14:46:17 +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 4T7xhT0zW6z4Cy0; Mon, 8 Jan 2024 14:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704725177; 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=23f8qd1SXI4Hzw7bgHBTh+Y3OrsQdbovT4MeBlOCcoo=; b=piuRoPe8EZOe3xj7YuhGjqiWpip8nZop1LBuTDHT4e47VXysmxVgSh9MnECe6RxJ4Gtqq3 WfjbCcQjysJjR3iPRTYR6dytYINQX5TCJ3GMOrS134v9AlHeP3RyyXhF3HeJGurJaBAC0m 0Xdt1Pfazo1GiLHyAnv9F8EB+rYA+yaGojJBnVFSrWNIGMKhf4+1Wl5jyXh6a+kLFVchTk Cs5qpFuPmnhoHGNVpwzsbtrju62VMdIg8PMU1nbKH23IByA3optbRifSDL5Z34ne9FjVTj rZSMdyokqhSULVwqJue3r8bLmxW7mmoZR/pPQo+nvuu0sZolC0JsSt5mb1nMkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704725177; 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=23f8qd1SXI4Hzw7bgHBTh+Y3OrsQdbovT4MeBlOCcoo=; b=ScKMYhxSQhc+J67X0qwu+deqwm4968JZ3nIH8WWgZ6uLcA1qpYtP7VC2ZwNyr9y/GUft58 w85Lg8KdmMcr0IeTDd9mTRYyBZD2YUR7yoTEPT4wdGt7OzucyHSt8PM1O5kOw3x5WowQ6V 9qA4qcXicGbZDC9YIRShxECzip1PhExCe8BPrEO1kUEd9wFM77aDTNF5+L7IEnGhjGXONB x0hxSVKK6i6XTsTtAQKFFSuTEJv108YkOH7Oii7PaTPMJ8k/f8m3Kr8A7KhRXZu8vsH8Ht ViBUrFXBmRzE4CoVpSSlz4mPI2wvR1x6C9zBcUrzEafs+gFvF9v5V9tpv4AKug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704725177; a=rsa-sha256; cv=none; b=weDQ2JUXxHsI/K2BTzc6+BrqHhS2hxL9jGc4TU881RGGW90kWCcI+Wm6entJvwFDc1svca 2+eenf7WotNfDlTPDXqdssrfjDiZ62EYaGlo9k2EjKStvZrPZp+g5hyotw7cqtuMzkQ2F+ lhsxz2ekpZDI/w+2BsHrZZHX3neHeJfQmdyslS3RrfdTIjuUG4VSKZuk06LW5l2d/qLel6 FJt/mSHdAuFxxIOPv4vxicUOInSERJSj9vQvdLHCIpDYZyUZlBu/Jv7P4T3CsEuiln+nh0 tarhBJTHX/uwiH123wpsqN8cN58DWwE8BKXPmtAxxZsPpJFfVhto2tfrdGCWnQ== 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 4T7xhT031Qz19Fv; Mon, 8 Jan 2024 14:46:17 +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 408EkGvJ034530; Mon, 8 Jan 2024 14:46:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 408EkGtx034527; Mon, 8 Jan 2024 14:46:16 GMT (envelope-from git) Date: Mon, 8 Jan 2024 14:46:16 GMT Message-Id: <202401081446.408EkGtx034527@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: 2b79df0ad999 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 2b79df0ad999df4bc22ed0e1eff446efa4055359 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2b79df0ad999df4bc22ed0e1eff446efa4055359 commit 2b79df0ad999df4bc22ed0e1eff446efa4055359 Author: Ed Maste AuthorDate: 2023-09-29 15:28:35 +0000 Commit: Ed Maste CommitDate: 2024-01-07 19:40:06 +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) --- 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 |