From owner-svn-src-all@FreeBSD.ORG  Sat Oct 29 17:29:00 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 504F9106566C;
	Sat, 29 Oct 2011 17:29:00 +0000 (UTC) (envelope-from jmg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 407F68FC0C;
	Sat, 29 Oct 2011 17:29:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9THT0tk026127;
	Sat, 29 Oct 2011 17:29:00 GMT (envelope-from jmg@svn.freebsd.org)
Received: (from jmg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9THT091026125;
	Sat, 29 Oct 2011 17:29:00 GMT (envelope-from jmg@svn.freebsd.org)
Message-Id: <201110291729.p9THT091026125@svn.freebsd.org>
From: John-Mark Gurney <jmg@FreeBSD.org>
Date: Sat, 29 Oct 2011 17:29:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226907 - head/sbin/fdisk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 29 Oct 2011 17:29:00 -0000

Author: jmg
Date: Sat Oct 29 17:28:59 2011
New Revision: 226907
URL: http://svn.freebsd.org/changeset/base/226907

Log:
  error if /boot/mbr is empty...  This can happen on a system like arm
  that doesn't have a /boot/mbr, and you touch it to get past the previous
  error message...
  
  MFC after:	1 week

Modified:
  head/sbin/fdisk/fdisk.c

Modified: head/sbin/fdisk/fdisk.c
==============================================================================
--- head/sbin/fdisk/fdisk.c	Sat Oct 29 16:38:04 2011	(r226906)
+++ head/sbin/fdisk/fdisk.c	Sat Oct 29 17:28:59 2011	(r226907)
@@ -513,6 +513,8 @@ init_boot(void)
 	if ((fdesc = open(fname, O_RDONLY)) == -1 ||
 	    fstat(fdesc, &sb) == -1)
 		err(1, "%s", fname);
+	if (sb.st_size == 0)
+		errx(1, "%s is empty, must not be.", fname);
 	if ((mboot.bootinst_size = sb.st_size) % secsize != 0)
 		errx(1, "%s: length must be a multiple of sector size", fname);
 	if (mboot.bootinst != NULL)