git: ecd943a5af7d - stable/15 - pkg-stage: Correct /packages permissions
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Oct 2025 01:32:19 UTC
The branch stable/15 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=ecd943a5af7d8cb09f9418a8a4d337a72c06fe22
commit ecd943a5af7d8cb09f9418a8a4d337a72c06fe22
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-10-15 13:04:58 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-10-17 01:31:29 +0000
pkg-stage: Correct /packages permissions
Include /packages in the METALOG used to create dvd1.iso. Previously
we used an expression ^./packages/ (with a trailing /) which did not
match /packages itself, and then with no METALOG entry /packages on
dvd1.iso ended up with mode d---------.
PR: 290222
Reviewed by: cperciva
MFC after: 1 minute
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 2db11dda840c4889aeb719761cdafa62730083a2)
---
release/scripts/pkg-stage.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index f9216b52b088..6d460a83e1da 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -110,7 +110,7 @@ ${PKGCMD} repo ${PKG_REPODIR}
if [ $NO_ROOT ]; then
mtree -c -p $ROOTDIR | mtree -C -k type,mode,link,size | \
- grep '^./packages/' >> $ROOTDIR/METALOG
+ grep '^./packages[/ ]' >> $ROOTDIR/METALOG
fi
# Always exit '0', even if pkg(8) complains about conflicts.