The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ed42b22abc48ba53aaa38e1e64438b6d71e7e944
commit ed42b22abc48ba53aaa38e1e64438b6d71e7e944
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2021-03-23 18:38:28 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2021-03-23 18:38:40 +0000
makefs: Ignore the "tags" keyword in mtree manifests
An install using -DNO_ROOT emits mtree entries containing tags used by
pkgbase. makefs(8) can safely ignore them, so do that rather than
emitting a warning for each entry.
Reviewed by: brooks, imp
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D29384
---
usr.sbin/makefs/mtree.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c
index 266315466900..4272299ce135 100644
--- a/usr.sbin/makefs/mtree.c
+++ b/usr.sbin/makefs/mtree.c
@@ -629,7 +629,13 @@ read_mtree_keywords(FILE *fp, fsnode *node)
error = ENOSYS;
break;
case 't':
- if (strcmp(keyword, "time") == 0) {
+ if (strcmp(keyword, "tags") == 0) {
+ if (value == NULL) {
+ error = ENOATTR;
+ break;
+ }
+ /* Ignore. */
+ } else if (strcmp(keyword, "time") == 0) {
if (value == NULL) {
error = ENOATTR;
break;
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
