From ed42b22abc48ba53aaa38e1e64438b6d71e7e944 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 23 Mar 2021 14:38:28 -0400
Subject: [PATCH] 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;