diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2021-03-23 18:38:28 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-03-23 18:38:40 +0000 |
| commit | ed42b22abc48ba53aaa38e1e64438b6d71e7e944 (patch) | |
| tree | 0ff3417ad76f8ee369d18f7399df4e59b263809b | |
| parent | 320bed3c007be1c2ff1f4b0d00d64d541d807fed (diff) | |
| download | src-ed42b22abc48ba53aaa38e1e64438b6d71e7e944.tar.gz src-ed42b22abc48ba53aaa38e1e64438b6d71e7e944.zip | |
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
| -rw-r--r-- | usr.sbin/makefs/mtree.c | 8 |
1 files changed, 7 insertions, 1 deletions
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; |