From owner-svn-src-head@freebsd.org  Fri Nov 15 18:34:24 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 676141ACF3D;
 Fri, 15 Nov 2019 18:34:24 +0000 (UTC)
 (envelope-from arichardson@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47F6Sw1RRLz3D5P;
 Fri, 15 Nov 2019 18:34:24 +0000 (UTC)
 (envelope-from arichardson@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C6891D032;
 Fri, 15 Nov 2019 18:34:24 +0000 (UTC)
 (envelope-from arichardson@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAFIYN69088805;
 Fri, 15 Nov 2019 18:34:23 GMT (envelope-from arichardson@FreeBSD.org)
Received: (from arichardson@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAFIYNIe088804;
 Fri, 15 Nov 2019 18:34:23 GMT (envelope-from arichardson@FreeBSD.org)
Message-Id: <201911151834.xAFIYNIe088804@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arichardson set sender to
 arichardson@FreeBSD.org using -f
From: Alex Richardson <arichardson@FreeBSD.org>
Date: Fri, 15 Nov 2019 18:34:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r354738 - head/usr.sbin/makefs
X-SVN-Group: head
X-SVN-Commit-Author: arichardson
X-SVN-Commit-Paths: head/usr.sbin/makefs
X-SVN-Commit-Revision: 354738
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Nov 2019 18:34:24 -0000

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