From owner-svn-src-all@FreeBSD.ORG  Fri Jun 27 17:18:54 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9573BB10;
 Fri, 27 Jun 2014 17:18:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 82C6A2680;
 Fri, 27 Jun 2014 17:18:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5RHIsBa097166;
 Fri, 27 Jun 2014 17:18:54 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5RHIsqB097165;
 Fri, 27 Jun 2014 17:18:54 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201406271718.s5RHIsqB097165@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Fri, 27 Jun 2014 17:18:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267963 - head/share/examples/bhyve
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.18
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: Fri, 27 Jun 2014 17:18:54 -0000

Author: neel
Date: Fri Jun 27 17:18:54 2014
New Revision: 267963
URL: http://svnweb.freebsd.org/changeset/base/267963

Log:
  After r267897 brought in a new version of file/libmagic, a filesystem image
  is identified as "DOS/MBR boot sector" as opposed to "x86 boot sector".
  
  This trips up vmrun.sh when using the new file(1) and makes it want to boot
  into the installer instead.
  
  Fix this by just looking for "boot sector" instead.

Modified:
  head/share/examples/bhyve/vmrun.sh

Modified: head/share/examples/bhyve/vmrun.sh
==============================================================================
--- head/share/examples/bhyve/vmrun.sh	Fri Jun 27 17:10:28 2014	(r267962)
+++ head/share/examples/bhyve/vmrun.sh	Fri Jun 27 17:18:54 2014	(r267963)
@@ -176,7 +176,7 @@ virtio_diskdev="$disk_dev0"
 while [ 1 ]; do
 	${BHYVECTL} --vm=${vmname} --destroy > /dev/null 2>&1
 
-	file ${virtio_diskdev} | grep ": x86 boot sector" > /dev/null
+	file ${virtio_diskdev} | grep "boot sector" > /dev/null
 	rc=$?
 	if [ $rc -ne 0 ]; then
 		file ${virtio_diskdev} | grep ": Unix Fast File sys" > /dev/null