From nobody Sun Jan 7 21:26:44 2024 X-Original-To: bugs@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 4T7Vd14sGjz561xB for ; Sun, 7 Jan 2024 21:26:45 +0000 (UTC) (envelope-from bugzilla-noreply@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 4T7Vd12xnTz4CgF for ; Sun, 7 Jan 2024 21:26:45 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704662805; 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: in-reply-to:in-reply-to:references:references; bh=01oQzW6HOdZePYZHhc6geifqP1zkXm7P4G1O8jO8kmE=; b=lHYHE/a0J8vH5RpPi90vVatTbYR01VlQ6QbWct8AIMyJiGELkr0iWEgh7tSwJ1BFdZ7Le6 Kap8fYK6/VNfDQ7jtqysX57+91iSSJP535Ye9vttpa6JXkM1EOphKz3Saq0rvOyzlxn3+l VRb0XXZSY8EaXAcsM6dwDV4UKFDm46ITw9ZO3SIE6T4KK5AC4aHu5VNjLevN6y6UF4B/87 zPAmtCFyi1j57FrPQvkyHeRT7O0nqcYr6uASrRobhs7ua3/cNgDo1ofH5IWYC1MhWUYVhk rpjFfS2ZYk3IAoMpRqnQHBymeDmObFT0AAfL4LFakU8sM6xEtPkCit8rr+FeKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704662805; a=rsa-sha256; cv=none; b=DxJcA1r7fNgEFhCcqImGD6ykchaNxHg3zK6oxtM6V7IUqzLWX0BtcoCfD8fcDBsSlQ8wsk SqSTFGw0pBWG3lMim+1IxYflz2rmb8gOE5hAGBn5uKRFzc8JlzQ2WJXYQloK4WzrN05IDn imZ/onKA4z0s+rw0S41wcWVvXTnaimsGnKn03RtmsG6LAdle/272ge3RZ0HB7nQvTYdGVm D97Uu5h948uzEgJ3GYVwYjN1FFlrK881wqkahf7MnGgXY2u679P81r9BYKuJn3QWC7V97L Qdih49XkyrP3inQLtMSFvYjkhMJMF98xRwretKFhVRWyfVU/SbjnUQUSIVblsg== Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 4T7Vd121pkzgvj for ; Sun, 7 Jan 2024 21:26:45 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 407LQjoG042109 for ; Sun, 7 Jan 2024 21:26:45 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 407LQjTg042108 for bugs@FreeBSD.org; Sun, 7 Jan 2024 21:26:45 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 273950] freebsd-update rollback (from 14.0-BETA2 back to 13.2) fails Date: Sun, 07 Jan 2024 21:26:44 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: misc X-Bugzilla-Version: CURRENT X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: commit-hook@FreeBSD.org X-Bugzilla-Status: In Progress X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-bugs@freebsd.org MIME-Version: 1.0 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D273950 --- Comment #9 from commit-hook@FreeBSD.org --- A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3D01e31d1d875f43a9d9c2d8f033409cbc7= 901c7ab commit 01e31d1d875f43a9d9c2d8f033409cbc7901c7ab Author: Ed Maste AuthorDate: 2023-09-12 02:59:30 +0000 Commit: Ed Maste CommitDate: 2024-01-07 20:41:48 +0000 freebsd-update: handle directories changing to files Further to f6d37c9ca13f ("freebsd-update: handle file -> directory on upgrade"), handle the reverse case of a directory changing to a file. We may not encounter this case on upgradess (before freebsd-update is retired) but it is needed to support rollback. PR: 273950 Reviewed by: dim Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41945 (cherry picked from commit c0f52443166ae7ecd512ab0350469d9c3648788c) (cherry picked from commit 1cf8528fec85a965baa5df2d8852166437af88a6) usr.sbin/freebsd-update/freebsd-update.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) --=20 You are receiving this mail because: You are the assignee for the bug.=