Author: arichardson Date: Fri Nov 15 18:34:23 2019 New Revision: 354738 URL: https://svnweb.freebsd.org/changeset/base/354738
Log: Fix contents= being ignored in msdosfs makefs mtree I noticed this while trying to build an EFI boot image Reviewed By: emaste Differential Revision: https://reviews.freebsd.org/D22387 Modified: head/usr.sbin/makefs/msdos.c Modified: head/usr.sbin/makefs/msdos.c ============================================================================== --- head/usr.sbin/makefs/msdos.c Fri Nov 15 18:02:37 2019 (r354737) +++ head/usr.sbin/makefs/msdos.c Fri Nov 15 18:34:23 2019 (r354738) @@ -262,7 +262,8 @@ msdos_populate_dir(const char *path, struct denode *di 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; } _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
