From nobody Wed Oct 18 14:54:29 2023 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 4S9Ylp1tL7z4x6mL for ; Wed, 18 Oct 2023 14:54:30 +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 4S9Ylp0g6vz3c5Z for ; Wed, 18 Oct 2023 14:54:30 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697640870; a=rsa-sha256; cv=none; b=cSMX1njdp07jhUprfJ4CXRtHJbM+CLL2knsm6SJj1J8QsY4ii96vdFXw/9IPArWVRofYpz 73Yu78H3RgMw1A+86I+D8OqByBl6yEgNkSgzbG+x+4c0JGkbUcO/CKDN1Oasi1i2xxj/RM gI12jynrMi/xeRgDebt+sLPz/BN3M5SUCoQoLj9czYbsil7GrzhGLD0mLQpYNY1AAemZpH Km0svEi23EIFgSjZnvcR01T3P00+6kHCFieFRANRgOpIyk8lqE2cvcP5M0OMCCWsF2UCCK FknxcdYedgkG6s6UMwJT+TTMKrYGp3ptxqul8/rjzAq1SmP+amnS23BSooG/Zg== 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=1697640870; 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=MjiUpxf9Ev1K+jUbe4rQqgOSTLO06gIkMDA952GLAmI=; b=V3z0EK0dSGh65yse1K6MudxLS031bc61QKlQESpB710SB5+fII3l+UDLjxyxtvpO3T/wwl 7GQ8EruSX5RPykLPaVNX45lNGtjaf7wg6955XgnnuIBQCZ0khE3cMNRP7TBy81ZC70rOfo 6MAwYCbHCzGzj/A2bR+7cYhMGj/RQ6hZeAQHYDjq42zDekcTO0509J/mbIJrBW+w3JqY1s SemNlfERjB6BAOe+SodOgs4/tf6wNpLTtlpPCaQm58Dks1fcVJ6YethiVA3azQbPK91EiN /zyC6VH5aRq9iV7uQPE3SW6s5wE+QXqhx4HqJW2UT/ngaE8GixTHIGtZ0HBN4g== 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 4S9Yln6qYZz19ck for ; Wed, 18 Oct 2023 14:54:29 +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 39IEsTNH081338 for ; Wed, 18 Oct 2023 14:54:29 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 39IEsTYF081337 for bugs@FreeBSD.org; Wed, 18 Oct 2023 14:54:29 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: Wed, 18 Oct 2023 14:54:29 +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: Open 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 #4 from commit-hook@FreeBSD.org --- A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc0f52443166ae7ecd512ab0350469d9c3= 648788c commit c0f52443166ae7ecd512ab0350469d9c3648788c Author: Ed Maste AuthorDate: 2023-09-12 02:59:30 +0000 Commit: Ed Maste CommitDate: 2023-10-18 14:48:58 +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 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.=