From nobody Sun Jan 07 01:27:31 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 4T701J1RBZz564hG; Sun, 7 Jan 2024 01:27:32 +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 4T701J0xJ9z4gG7; Sun, 7 Jan 2024 01:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704590852; 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=Y1fwz2N0Gqacru6SJXywm1IO5MowPsVvsCqspi9QyFQ=; b=GiTzjJC+o3EIDbDCdebEAAzHc3aPq/cf4HUCq42+YZX+boytjm2tsreoJZGJVCOTY1xI5X r2U02wwNj1dS6VsfAnVZDACRXqmPv8HF/We9YRohVlWHxglOj7GTXn7X+6jkGuBlqWIROY nU6xmeTacqdlkgEz4RO49x6KnIKFz1Q0faIbiEygqEMT+kl/dE5wIp2gBZxKiRLFu3oP6M r1aUccm0nt6f4VxLpgj1gn/t4zpCutPB17gEFEed6MAopKo491L/WkMawyf/M5hMecRmOJ 9zaFRT/J6aMRWaYkoIXBkLv+iSXvo8cjJPCUI4ylBWNuyqlD4GtknVgdS0Nvng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704590852; 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=Y1fwz2N0Gqacru6SJXywm1IO5MowPsVvsCqspi9QyFQ=; b=eDJVwyUb4qKZPolmXD6ngmh3NiJB7ysOVDu5VFUIs6Xxb5/jIHxDzPdFcgAJ7JJRnrclX6 TaZqAGlOUwnWEckHJIFbnw88Aakg52pL3lvRqhcAgYXUhcuNLIKFYqAZ0miyxhK+XWjI0e LsceQPAmqkk7ds0uGawf1dz8CDnNJ0PeOwSyqUcn8+rG+KBlTXkETLMt35Mwcgpmme0eAQ ivGdxwJr4foq+HFT1r7bNptpvD0EPdhGvSNfDZ/DUqKoGyZpbirGL6PmhBGpPvybspHAl9 OHzUerPglY0UE8il1oT92v0//imTaLIJWkoj+QN8RahPIxAfoMWGPOyNjPSxfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704590852; a=rsa-sha256; cv=none; b=FivLYddlgucwk/k+9YCG3PUlZMcP9fpQRUamM3QL4pPFvnL6htVcRjpr9wJzNlTzb7aJ9w iGr6qfWWr9/OEw4gEU9e6Vp9qjurX3EBJxZK7wgHXBc5KV3XscfmtaovqTeMZ1egf9zqnA nN8GUXbA+iWvgf8ZSFr5PznlDQE7YhVWgilh6dm8xqgF7m8OXnJbTh/jW/CZh/NntgsIjE PesT+rlTCEULg+a8OEcKlDaxIqpet+bAvWG64bIqEJ/lHa33hde/kgfM3t7hZqjqHKeGXQ wNovrxofQ+YxRoGNx4lzZxt+Lr+9XHG4Y/2HMktzsIMxziAvw6+QZFkKszVcAA== 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 4T701J00DCz140h; Sun, 7 Jan 2024 01:27:31 +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 4071RVXu068853; Sun, 7 Jan 2024 01:27:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4071RV06068850; Sun, 7 Jan 2024 01:27:31 GMT (envelope-from git) Date: Sun, 7 Jan 2024 01:27:31 GMT Message-Id: <202401070127.4071RV06068850@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: 1cf8528fec85 - stable/14 - freebsd-update: handle directories changing to files 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: 1cf8528fec85a965baa5df2d8852166437af88a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1cf8528fec85a965baa5df2d8852166437af88a6 commit 1cf8528fec85a965baa5df2d8852166437af88a6 Author: Ed Maste AuthorDate: 2023-09-12 02:59:30 +0000 Commit: Ed Maste CommitDate: 2024-01-07 01:27:17 +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) --- usr.sbin/freebsd-update/freebsd-update.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index f5289e1cd9fc..7408ef1c6721 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2899,6 +2899,15 @@ backup_kernel () { set +f } +# Check for and remove an existing directory that conflicts with the file or +# symlink that we are going to install. +dir_conflict () { + if [ -d "$1" ]; then + echo "Removing conflicting directory $1" + rm -rf -- "$1" + fi +} + # Install new files install_from_index () { # First pass: Do everything apart from setting file flags. We @@ -2919,6 +2928,7 @@ install_from_index () { -m ${PERM} ${BASEDIR}/${FPATH} ;; f) + dir_conflict "${BASEDIR}/${FPATH}" if [ -z "${LINK}" ]; then # Create a file, without setting flags. gunzip < files/${HASH}.gz > ${HASH} @@ -2931,6 +2941,7 @@ install_from_index () { fi ;; L) + dir_conflict "${BASEDIR}/${FPATH}" # Create a symlink ln -sfh ${HASH} ${BASEDIR}/${FPATH} ;; @@ -2967,10 +2978,14 @@ install_delete () { rmdir ${BASEDIR}/${FPATH} ;; f) - rm ${BASEDIR}/${FPATH} + if [ -f "${BASEDIR}/${FPATH}" ]; then + rm "${BASEDIR}/${FPATH}" + fi ;; L) - rm ${BASEDIR}/${FPATH} + if [ -L "${BASEDIR}/${FPATH}" ]; then + rm "${BASEDIR}/${FPATH}" + fi ;; esac done < killfiles