From owner-svn-src-all@FreeBSD.ORG  Thu Dec  9 15:26:38 2010
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 82766106566B;
	Thu,  9 Dec 2010 15:26:38 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7189E8FC0C;
	Thu,  9 Dec 2010 15:26:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB9FQcev042532;
	Thu, 9 Dec 2010 15:26:38 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB9FQcnd042530;
	Thu, 9 Dec 2010 15:26:38 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201012091526.oB9FQcnd042530@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Thu, 9 Dec 2010 15:26:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216326 - stable/8/usr.sbin/boot0cfg
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: Thu, 09 Dec 2010 15:26:38 -0000

Author: brucec
Date: Thu Dec  9 15:26:38 2010
New Revision: 216326
URL: http://svn.freebsd.org/changeset/base/216326

Log:
  MFC r216229:
  
  Revert r209469: it causes the rest of the function to be bypassed.
  
  Approved by:	re (kensmith)

Modified:
  stable/8/usr.sbin/boot0cfg/boot0cfg.c
Directory Properties:
  stable/8/usr.sbin/boot0cfg/   (props changed)

Modified: stable/8/usr.sbin/boot0cfg/boot0cfg.c
==============================================================================
--- stable/8/usr.sbin/boot0cfg/boot0cfg.c	Thu Dec  9 15:24:59 2010	(r216325)
+++ stable/8/usr.sbin/boot0cfg/boot0cfg.c	Thu Dec  9 15:26:38 2010	(r216326)
@@ -356,8 +356,6 @@ write_mbr(const char *fname, int flags, 
 	if (n != mbr_size)
 	   errx(1, "%s: short write", fname);
 	return;
-    } else {
-	    err(1, "write_mbr: %s", fname);
     }
 
     /*