From nobody Wed Sep 23 18:36:55 2026 X-Original-To: dev-commits-src-branches@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 4hqm082JPxz6tSCJ for ; Wed, 23 Sep 2026 18:36:56 +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 4hqm0770tcz4twV for ; Wed, 23 Sep 2026 18:36:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790188616; 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=2b3ErNAXAMdneI7CdVS0Oli7+bPUf2RzCFJk6JAuYOk=; b=nWloNl32crewCtWY8aKN2KHVa/zK08CuzjLC2bmkLGtLOw2UmCYKItMDKI+NCfzYJkXWUE sWzJJSJoLn7/BC3JvJzl82DnrHW0Qn7qMxJJI4+bb3lmEgMk4/nL6ZjfIfG+xWlisXAn98 GPtagk33Cy2YPC17HSrdG85NPO7JDRLu+qfiByMCorXZUN71Ni8PrAKhmKRtGH8JjkPzDD QbL7DgpzdKN2vn4bp96eYoURbnFtmEHg3qwIRjvKzWZb7G5nWXn7MkbLJ1sv86X7wInfLA MekH8My3hc8rXoCDT9+xcvgO45i5y7/xzcqaiu/FZYaFJY7dSVegjuiCCJlDbQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790188616; b=aOMUBUl+x1ufDmu/g/ZIY3jTNSQiIMyj2ouAkh3VY3jApxiWDl0ydxqV/xSGZWfBI+VOs1 ndZYKKyaJeU5bWso9TPVGBkWbY85GoJKXVyq/xPYE8OKlZ6xFtRB5OrZuWifWhzlLQwsEU Nbf0o71sK/4kbz0B8833fRvhGeyq6fyPBAOujqVo6V5TuAvHn/DBoI5K7kGW3iwiHBOGrl r5cMYKMfUOGqLGka2Iih99pHyAXKXka0u0+lNf3wXEty7ysR/x12U8H2CB2lZWMZTzi/Zu wgkKTKjf/7QjbB9Zj9vX7aU6S5ry+ldFZmQAEl+iIXmXeks2WpjrWdz01XRjLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790188616; 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=2b3ErNAXAMdneI7CdVS0Oli7+bPUf2RzCFJk6JAuYOk=; b=Wp7p3U205fp7/gB6j5tUOYeRT03yk5qyK6lwx+lH/fM0nEsN3tnY/GWG6aZSopiu4S9UHE RZdhs1ytA6CYboXFgVDzY8PmiyNX0z8aBce8+Pt2sNstrxBqmPiki+1lSX66QnBtOsbKTB b9W+JhWKOuuHRQnzCi2w48tMsXUT24aZYZ6F6Wp/M8oEzB/7B5gaePjBVDdx0+lelnAZPQ 8zLH+sFdqcq1I33xyNFtF/pRXnNeSYxj/2BvgHUx08Ynq/5jBapIIdiCpEjPRo4VPMrBPt nmxvlPKNoD9MIakerO1gDtio0kSqoC2lrJYyg8CE6QjSNcV3PK7PJzAW1RfpaQ== 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 4hqm075XCWz150D for ; Wed, 23 Sep 2026 18:36:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2375e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 23 Sep 2026 18:36:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 7fab248fed5b - stable/15 - vmimage.subr: Include dangling symlinks in images List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 7fab248fed5b001cc2337ff68d0da8efe5c2f8d4 Auto-Submitted: auto-generated Date: Wed, 23 Sep 2026 18:36:55 +0000 Message-Id: <6ab41c47.2375e.8cbdcbd@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7fab248fed5b001cc2337ff68d0da8efe5c2f8d4 commit 7fab248fed5b001cc2337ff68d0da8efe5c2f8d4 Author: Colin Percival AuthorDate: 2026-09-22 00:08:26 +0000 Commit: Colin Percival CommitDate: 2026-09-23 18:36:29 +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 (cherry picked from commit 5a2328a17851ac609ab6c786d9b0db388f15e6b3) --- 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