From nobody Tue Sep 22 00:19:10 2026 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 4hpggy4sjHz6sRWY for ; Tue, 22 Sep 2026 00:19:10 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hpggy4NTHz4C9D for ; Tue, 22 Sep 2026 00:19:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790036350; 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=kEG5r9//8d0JX02Q24sXkZNEDZxB532eoBs1bPpl3KE=; b=Rj8FHXE7IBN19Xi2dHM809EPYveQzPljUPvIeqzZquIeYE54TdlQIFV5h1XbizKCTIjVMq ABRWrpmATpCtrCrr1IpcXyNWRozKiual72YJo/PLYdWg/fN2/B4ft2DTvAW9X3WOfogC8E msjuSw6vXuzsbASQGg6xt/IPlydv9JjyElOGdNPEZMgDAillMv01ghu8bITQypTPok2869 8Iz6gt1kjlndgyijN1U+CEePsb+5GS6pVFgUJp/M3WtiS76Cr714WYALcVOFVWHqMt/DOX j/VOs5BDX/9+TddZnSNsF10RvBftNEfPmu+PD7OPplc48Z+aFWWwW6nJYkrjIA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790036350; b=ugg6DuSezR0vXK3QfOcZi/Vxi1G70SEg2lp+/vMfOQu2gUJuzaaKZICI9X/AN6SmBK2QIK Is12hd8kA+JntUSrwnSyYeMb9q1Yf+hvSqhuqJ9TZYwZjYHefNtEjD86WfgZYO6jrAl0d9 ahqtuGrao2iUYFZ1wP/5823k9xDRx0gx7JqeLKyOudmcoUQIzQBGF7sAxj3I8tgzCUCIYy sqhHvYxaUnjCc0XdHWCpidt3bPULE8fGcb/cSmCV5m9QuaEqd0c5fbVr1K9Axm6FQUAzsK b7ARTOlDvbefcIfzNTyjQgDThwYC9HwevnxWyFNjznNBokQUnplJumhU1Pg9+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790036350; 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=kEG5r9//8d0JX02Q24sXkZNEDZxB532eoBs1bPpl3KE=; b=fNTJdere3ABua+e2yjfU8WebAq4er4Dy1M0JowCRfzSvwPdqzf3L7KAEmaU9nWhKt3P8K1 PSJ/h8m8miRKsPuHJbOuFp6CBWrjBhPhyA/eyaDjoAw7YwrbzomoeLn/eC5yc0WdQotOa4 3FN8AVrJtUwcuao374kHt4T+XvSjdyLzIcP2jES8tVyhqrwTROWcEo/HGQwCKNepL+//Ls SQ4N/ezRl4owM/XRMjrrC56XAvMftfqlJjNaKmfOVdskUHHvOp+86vOKWtoAK9DpYecG9M TOmvXKTLFBwLoAD/VVtpRy7Im95sPBTWSRHmUoFeUPwzWCeHFmx6zrqh1xvjjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hpggy38v7zkKn for ; Tue, 22 Sep 2026 00:19:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41a42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 22 Sep 2026 00:19:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 5a2328a17851 - main - vmimage.subr: Include dangling symlinks in images 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a2328a17851ac609ab6c786d9b0db388f15e6b3 Auto-Submitted: auto-generated Date: Tue, 22 Sep 2026 00:19:10 +0000 Message-Id: <6ab1c97e.41a42.5cd7b4ce@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5a2328a17851ac609ab6c786d9b0db388f15e6b3 commit 5a2328a17851ac609ab6c786d9b0db388f15e6b3 Author: Colin Percival AuthorDate: 2026-09-22 00:08:26 +0000 Commit: Colin Percival CommitDate: 2026-09-22 00:19:01 +0000 vmimage.subr: Include dangling symlinks in images When creating VM images, we filter the METALOG file created by pkg(8) when installing non-base packages, rejecting any lines which correspond to files which don't exist; this solves a problem which arose when a package was installed and then deinstalled (or upgraded) later in the image-building process. Unfortunately [ -e ... ] follows symlinks and is not basedir-aware, so an absolute symlink which is valid *inside* the image is omitted from the image if it points to something which isn't present in the build host system. Replace [ -e ... ] with [ -e ... ] || [ -L ... ] so that symlinks are included even if dangling. While I'm here, add quoting in case future paths become problematic. Sponsored by: Amazon MFC after: 3 days --- release/tools/vmimage.subr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index f06bf4848cb8..b8d2be965dde 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -266,7 +266,8 @@ buildfs() { # have been logged which no longer exist if a package was removed. if [ -f ${DESTDIR}/METALOG.pkg ]; then while read F REST; do - if [ -e ${DESTDIR}/${F} ]; then + if [ -e "${DESTDIR}/${F}" ] || + [ -L "${DESTDIR}/${F}" ]; then echo "${F} ${REST}" >> ${DESTDIR}/METALOG fi done < ${DESTDIR}/METALOG.pkg