From nobody Sat Nov 16 07:23:48 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 4Xr53T2vsbz5cyhm; Sat, 16 Nov 2024 07:23:49 +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 4Xr53T0JMtz4g4m; Sat, 16 Nov 2024 07:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731741829; 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=6wOFUd7Rx0xWdBfjZbIRBqWwCWTBJwtQDlmGvjp+oWk=; b=ZqNMnF31u2d8DmukPwrFR1zkqv27Oc/rlXmnJaU7InGWZNLZqv5TdMpaKVNa4vLscAo9sD 3LzFKdVnGM/UmwStxuhn+KtiRj9xnV7EcBjxcaDjx2x3oYYJnz4X/0vEuJ0FrKHyffn6jC gQMN/sAKYNL0o1aKYWthSdI0JVOx8QiquRGsnOpd1Xif/3dmjtFxLe7z+Cp+/oBUNK3J2a oxn/4lux35g0CkxM4iF/mIOThlkgTzbiGSk6P7Lp1Q/zujSHxZkdOTMztbr2hYFNKA6hW5 fxr+miQnSZrRIQWDUBDv1Mk3YpkOTVoP3GpB/54R/esXGQqyW5VkVpXGPdY5sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731741829; 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=6wOFUd7Rx0xWdBfjZbIRBqWwCWTBJwtQDlmGvjp+oWk=; b=fPNZOopS7N8qNbo99o35vFr0YxE+FVkGN0kciAfmLIXAYIfgzviS1f636F2vvG5p1wDrme Or8oeiUVxjCGmZdOvZO+1qK46C6ivaQ5Voud9xxzY3Tg7KRi3CKWQVDWpFSXmvR3X475j7 ClKiyp5i/M/MILo5EinbslyuVqGGWTKnRYD9Mvlf0l2aoLPvl4oh+tPk+WoXPYwWXSTz0L zN6XzfkoIlMKD1Kii8IhIyZOBczj/7ZXmeocWR2EkXqAJPdX8ySgGr6cFGXcgXSoNwffne hutOmZJI5PMhfaBJ2q2sRsrg1p6Qt7Ay057kgI+hYV3IDIrDUIcKS/HMSSWYMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731741829; a=rsa-sha256; cv=none; b=S84gzWTSxQnIROULxOzSnOpG07mkV/xX4DHUgNRQhbLUpNNMUGcP1GRcw71hcvxzVRR0Oq HB1E8UNvgEV7rKL6GOkrPUilxpNGeEkqpnf/uxP/Jl9ZV3YU6vMcEqN/06dWCIEPXkUPWl zvXlvyICBPiXCPJBWpRRmYA5aohUb5jM4990a0tFY/kStPNG7EFQJXRNUdcpKwOTrtn0WP WMjSkcok/hY8MITXQSkB/idpKOTfFWUOnhg7MLCwgsLdbQpbpS4Ns42oVE90VjezwMrD6y OrQ/htclu3nGCQA4a/Q+dgeBWVRDSlWYJXsO8fJYrzxlFwdjlNfXYfIlLXVdOQ== 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 4Xr53S72YgzxKw; Sat, 16 Nov 2024 07:23:48 +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 4AG7Nm1L018541; Sat, 16 Nov 2024 07:23:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AG7NmEf018538; Sat, 16 Nov 2024 07:23:48 GMT (envelope-from git) Date: Sat, 16 Nov 2024 07:23:48 GMT Message-Id: <202411160723.4AG7NmEf018538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 4223c668e4b9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4223c668e4b9ba71e2c6cfabbd66795729b7ff8b Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=4223c668e4b9ba71e2c6cfabbd66795729b7ff8b commit 4223c668e4b9ba71e2c6cfabbd66795729b7ff8b Author: Jose Luis Duran AuthorDate: 2024-11-12 20:17:14 +0000 Commit: Jose Luis Duran CommitDate: 2024-11-16 07:06:14 +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 --- 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 0161a8ab8fd3..1e38a07337c7 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