diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2025-09-11 13:05:13 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2025-09-11 13:05:13 +0000 |
| commit | 6207325f3aac067fb16f0aa42012302014035ebf (patch) | |
| tree | c18f7b6cfbd0aaa7c5da224b4999832ee2394515 | |
| parent | 70afc95fc6ecec6edabf5b1e8b060bb0b29ebd55 (diff) | |
release: Made it possible to specify more attributes in metalog entries
Verify that the target file or directory exists, and add support for an
optional mode. This is required to enable NO_ROOT builds of some
cloudware image types. No functional change intended.
Reviewed by: cperciva, emaste
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D52449
| -rw-r--r-- | release/tools/vmimage.subr | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 20ffe3b2dac7..32eec6f220e7 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -39,8 +39,21 @@ cleanup() { } metalog_add_data() { + local file mode type + if [ -n "${NO_ROOT}" ]; then - echo "$1 type=file uname=root gname=wheel mode=0644" >> \ + file=$1 + if [ -f ${DESTDIR}/${file} ]; then + type=file + mode=${2:-0644} + elif [ -d ${DESTDIR}/${file} ]; then + type=dir + mode=${2:-0755} + else + echo "metalog_add_data: ${file} not found" >&2 + return 1 + fi + echo "${file} type=${type} uname=root gname=wheel mode=${mode}" >> \ ${DESTDIR}/METALOG fi } |