From nobody Mon Dec 16 15:14:42 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 4YBk4y2wPQz5hYCn; Mon, 16 Dec 2024 15:14:42 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBk4y0ywMz46N4; Mon, 16 Dec 2024 15:14:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362082; 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=/B28NCga+735L1USRGyXtdnf+OH2had04hC1rEYcbsI=; b=elneFKlzhLKTSKa9/FXbxtV2Y9EHjyjkS8DJfwg+S1YneLo7oxjnAbm1R5RXvff11HQfUw stq4WTaEI0BU+eW/bbtVKXAPBVYWVruHSG/jVYbhLW6VOlIL+MR3kmygs58vWIg4vLL+ry a7wVI+SroBYFT3qbzwhV7p99CtvZDxJvmQWQSTJQH+KwBW5r7LzfhXGXrF1QfbrbdTFaNf DUhwwV3y2rsh8b2ePq22LCgrblOm/hSi2llS/vqecz6ObuabQrQa1U84ByVkCv2AYMcgg9 gxlkGwNZ1kKmIFdJGdut+372Pz5AAug9JAQt3UbYQ5uobJVDAiWsPrf5PDe1nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362082; 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=/B28NCga+735L1USRGyXtdnf+OH2had04hC1rEYcbsI=; b=PnHx3qXfl+uzw5Y1shmuFHigTh0l9xNBozTFfBaRLrTQbPG6mD7qNGFUhtKNtE2/Zyffe8 qwWBeVy4L95/813L17ywKkMruInp5obRPplrfK0N6hVEx8izjPwuHS/TerubXmycYYxx4K 7ekEp7gE5vPFpo3aTF6q1kPeZTICBf1cJnkgJkAcY8DOlNLGEyZsLojWMNPkl7mDLdQOWX OXJc4ZBbWw+Mqw2yMMV2Z9yRi0UIRBKf7mqBmfircLTDw01AalLBEpza5Y9009XghNwpY3 nU9ihuOqmFDDX1APqmsA4HTr1iy6iyYZd0A774tnQ/KecvPXGzas4NnXJcrPzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734362082; a=rsa-sha256; cv=none; b=BA20LXkP0nkBcFQPpySmTI05bGxObt8wtaAvlzBjkCb3DE9uxPunOTSD6OBMxXxdLy5F80 36lmuY4QJforRW0IKiJYvUz4ArAU2Zaq+qjzsA1BdS6A13xj32rC9G3cyph03tRjTQkh+P NygH/opJFvA6F5PBq8YPFUHTuAkrlAjhlFgoNzpGvLK1Ke08qP8UEC18fGEEU+NAkoqPYe py1O7yWwyqeDXa/Ky2CbNBVvK4UqnvVMnzPvTUNDKVV7/HUb3JNF1BqHVlqREBk7PyUMKg G82KImkzMUp9oN4OuFpaPOMB55NPsnKIW4Akr9xQhmoWtSVyPkhjJ21q6oMbrQ== 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 4YBk4y0bD1zy4h; Mon, 16 Dec 2024 15:14:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BGFEglU011276; Mon, 16 Dec 2024 15:14:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGFEgDm011273; Mon, 16 Dec 2024 15:14:42 GMT (envelope-from git) Date: Mon, 16 Dec 2024 15:14:42 GMT Message-Id: <202412161514.4BGFEgDm011273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 7594f6ce25e2 - stable/14 - nanobsd: Use the real path for NANO_PACKAGE_DIR 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7594f6ce25e25fe098da361d862f7db54cf4f27a Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=7594f6ce25e25fe098da361d862f7db54cf4f27a commit 7594f6ce25e25fe098da361d862f7db54cf4f27a Author: Jose Luis Duran AuthorDate: 2024-11-12 20:17:14 +0000 Commit: Jose Luis Duran CommitDate: 2024-12-16 15:12:05 +0000 nanobsd: Use the real path for NANO_PACKAGE_DIR As users may have the Pkg directory as a symbolic link to the NanoBSD "package dump directory". In commit 9af130ae8c03, cust_pkgng() was greatly improved, however as a side effect of using a nullfs mount, the directories and files must not be symlinks. Fix it by using NANO_PACKAGE_DIR realpath(). PR: 269884 Reviewed by: imp Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47532 (cherry picked from commit 4223c668e4b9ba71e2c6cfabbd66795729b7ff8b) --- tools/tools/nanobsd/defaults.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index e431f6653fec..119c632b328d 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -788,6 +788,7 @@ cust_pkgng ( ) ( fi # If the package directory doesn't exist, we're done. + NANO_PACKAGE_DIR="$(realpath $NANO_PACKAGE_DIR)" if [ ! -d ${NANO_PACKAGE_DIR} ]; then echo "DONE 0 packages" return 0