git: aed4089c2573 - main - nanobsd: Use NANO_DEF_{UNAME,GNAME}
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 20 Jan 2026 16:51:37 UTC
The branch main has been updated by jlduran:
URL: https://cgit.FreeBSD.org/src/commit/?id=aed4089c2573420be042a90af51fb538d0b63fe5
commit aed4089c2573420be042a90af51fb538d0b63fe5
Author: Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2026-01-20 16:51:06 +0000
Commit: Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2026-01-20 16:51:06 +0000
nanobsd: Use NANO_DEF_{UNAME,GNAME}
Prefer to use NANO_DEF_UNAME and NANO_DEF_GNAME instead of a fixed
"root/wheel".
Fixes: 61ac7309c366 ("nanobsd: Add a provisional populate_part function")
MFC after: 3 days
---
tools/tools/nanobsd/defaults.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
index 86aaeffdc944..a0a186cee42f 100755
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -780,8 +780,8 @@ _populate_part() (
cd "${dir}"
mtree -bc -k flags,gid,gname,link,mode,uid,uname |
mtree -C | tail -n +2 |
- sed 's/uid=[[:digit:]]*/uname=root/g' |
- sed 's/gid=[[:digit:]]*/gname=wheel/g' >> "${metalog}"
+ sed "s/uid=[[:digit:]]*/uname=${NANO_DEF_UNAME}/g" |
+ sed "s/gid=[[:digit:]]*/gname=${NANO_DEF_GNAME}/g" >> "${metalog}"
)
fi