git: edda63ba979a - stable/13 - makefs: Ignore the "tags" keyword in mtree manifests

[Mark Johnston]

The branch stable/13 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=edda63ba979a8e39e935ed97e1c9049ee1ff4e0a

commit edda63ba979a8e39e935ed97e1c9049ee1ff4e0a
Author:     Mark Johnston <markj at FreeBSD.org>
AuthorDate: 2021-03-23 18:38:28 +0000
Commit:     Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-04-06 13:07:24 +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
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D29384
    
    (cherry picked from commit ed42b22abc48ba53aaa38e1e64438b6d71e7e944)
---
 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;