git: 7594f6ce25e2 - stable/14 - nanobsd: Use the real path for NANO_PACKAGE_DIR
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 16 Dec 2024 15:14:42 UTC
The branch stable/14 has been updated by jlduran:
URL: https://cgit.FreeBSD.org/src/commit/?id=7594f6ce25e25fe098da361d862f7db54cf4f27a
commit 7594f6ce25e25fe098da361d862f7db54cf4f27a
Author: Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2024-11-12 20:17:14 +0000
Commit: Jose Luis Duran <jlduran@FreeBSD.org>
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