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

Fix contents= being ignored in msdosfs makefs mtree

Browse Source 
I noticed this while trying to build an EFI boot image

Reviewed By:	emaste
Differential Revision: https://reviews.freebsd.org/D22387
This commit is contained in:
Alex Richardson 2019-11-15 18:34:23 +00:00
parent 782b97cb80
commit 62a3510f1f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=354738
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/makefs/msdos.c
View File

@ -262,7 +262,8 @@ msdos_populate_dir(const char *path, struct denode *dir, fsnode *root,
cur->name);
continue;
}
if (msdosfs_mkfile(pbuf, dir, cur) == NULL) {
if (msdosfs_mkfile(cur->contents ? cur->contents : pbuf, dir,
cur) == NULL) {
warn("msdosfs_mkfile %s", pbuf);
return -1;
}