From owner-svn-src-all@freebsd.org  Wed Jul 22 22:53:41 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92B0F9A8E04;
 Wed, 22 Jul 2015 22:53:41 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 834E11B5E;
 Wed, 22 Jul 2015 22:53:41 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6MMrfLd089274;
 Wed, 22 Jul 2015 22:53:41 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6MMrfrc089273;
 Wed, 22 Jul 2015 22:53:41 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201507222253.t6MMrfrc089273@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Wed, 22 Jul 2015 22:53:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285804 - head/sbin/mount_nfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Jul 2015 22:53:41 -0000

Author: cem
Date: Wed Jul 22 22:53:40 2015
New Revision: 285804
URL: https://svnweb.freebsd.org/changeset/base/285804

Log:
  mount_nfs: Be more clear on nmount(2) error with errmsg unset
  
  Differential Revision:	https://reviews.freebsd.org/D3147
  Reviewed by:	rmacklem
  Approved by:	markj (mentor)
  MFC after:	2 weeks
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sbin/mount_nfs/mount_nfs.c

Modified: head/sbin/mount_nfs/mount_nfs.c
==============================================================================
--- head/sbin/mount_nfs/mount_nfs.c	Wed Jul 22 19:58:21 2015	(r285803)
+++ head/sbin/mount_nfs/mount_nfs.c	Wed Jul 22 22:53:40 2015	(r285804)
@@ -476,7 +476,8 @@ main(int argc, char *argv[])
 	build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
 
 	if (nmount(iov, iovlen, 0))
-		err(1, "%s, %s", mntpath, errmsg);
+		err(1, "nmount: %s%s%s", mntpath, errmsg[0] ? ", " : "",
+		    errmsg);
 
 	exit(0);
 }