From nobody Mon Dec 16 15:15:24 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 4YBk5m5gyDz5hYZQ; Mon, 16 Dec 2024 15:15:24 +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 4YBk5m4Rfbz48Rl; Mon, 16 Dec 2024 15:15:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362124; 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=9DPmFiCrmWuYI+HGZwgYnRUBpTpePpwfpM+zXONuu44=; b=hYmm5tDMCqKn3W33heRITHlaZRiiesLtnssYm5zTKI1dVAOdPLrUhZ5h2nkJC/ObstcCZo 73uxiw1zfQZAy3CLM6ZqzxJfke4KXaM3Pheucc/9vbmseFtYNlk5qfmE5OTcZDwe+xIr99 YvOgfNp2WMI4g4xTbO1TS6adOtJiw/PlM8GUaZVOFuYnH3gXlCQcl2IcsFOmk5OyVe3Mp9 fU2ZZzN9jQMRAIrMa1PK52t2ARtxVDc70j8m5Xga5VsFju5FM7ttFAnk+RBHzw5b5sgXrt 8ZLfW7ndKQiqu1zF7XsEl+wc/Dp5DvuPrfp9wzIEnCjTZImZU7lSr79bZOsj1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362124; 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=9DPmFiCrmWuYI+HGZwgYnRUBpTpePpwfpM+zXONuu44=; b=hMR5RFJsF9WCtcIAlQ8CFEYAjkO/60vbSYp8KDNR8Ysckxp8Pg56k0pZCWhUu8li1TV1XE BLnIX384w4z0TKFa/bFVfaTv1imFa9o7gulPmLpi8XWyll2UL0M/uWVqP5+RjioWYFJLMq 3Xw6FN2CoPoCXwmlNiRVj2OyrTSALh8gdjkhtxz8/eEOm4oW1CvST8Zlygyxa7syiXRRHh uWyCIErnUiO8FBFBnnrPUH+zXq0uW4ZuS/DB9B3wfqa9GMupp7IqB7Wpgc6wvcMSIQ9fsi Okd+q+YUgxNJR3fU16WRjpahu8op03InQER+saHjrIEHrypKvhEjvFLLSfaHMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734362124; a=rsa-sha256; cv=none; b=bgodcIE9oDWOvQ67dtSYAto1GBi1CjTXG9TiOhJ+YIbdx7PCI6QZyZXdpq3ueif5jjme83 vdd5Ky8FvMziY1EcLLv4vX9exSeRlppXiaOOpHLP+Q0dHOgpYv7YAZ/iiiXKxE2tSxypph dm+sgH8WVcfk/lcBRTD+baaV6o2oNzAeRP9qBFo9FxatQo19n8ExX9NWZXZ+Lqjjg+69ND NN7EoCFkNeF+rq5oqMMa+3oUMC9C36SNNsTyXFUqYbnL4QkoFztbeQ/rwAhOwtuNcv1ht/ 23WskCcYPFFT1p1C9Ryi6hYz0tbkSAGjsr+jFj1BCVcv9fxSySvF0KKd2RQqQA== 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 4YBk5m3z2QzyZV; Mon, 16 Dec 2024 15:15:24 +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 4BGFFOOJ012058; Mon, 16 Dec 2024 15:15:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGFFOQO012055; Mon, 16 Dec 2024 15:15:24 GMT (envelope-from git) Date: Mon, 16 Dec 2024 15:15:24 GMT Message-Id: <202412161515.4BGFFOQO012055@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: a7e4493778b0 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: a7e4493778b02af51344ab6d217942c2440d3736 Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=a7e4493778b02af51344ab6d217942c2440d3736 commit a7e4493778b02af51344ab6d217942c2440d3736 Author: Jose Luis Duran AuthorDate: 2024-11-12 20:17:14 +0000 Commit: Jose Luis Duran CommitDate: 2024-12-16 15:13:44 +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 bb1e96b911e5..69e89958b02b 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