d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makefs: Ignore the "tags" keyword in mtree manifests

Browse Source 
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
This commit is contained in:
Mark Johnston 2021-03-23 14:38:28 -04:00
parent 320bed3c00
commit ed42b22abc
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/makefs/mtree.c
View File

@ -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;