From owner-svn-src-all@FreeBSD.ORG  Sun Jul 13 17:49:28 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 3FB1CA17;
 Sun, 13 Jul 2014 17:49:28 +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 2C31C2A43;
 Sun, 13 Jul 2014 17:49:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6DHnSJS099035;
 Sun, 13 Jul 2014 17:49:28 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6DHnSFW099033;
 Sun, 13 Jul 2014 17:49:28 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201407131749.s6DHnSFW099033@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Sun, 13 Jul 2014 17:49:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r268594 - stable/10/share/examples/bhyve
X-SVN-Group: stable-10
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: Sun, 13 Jul 2014 17:49:28 -0000

Author: jhb
Date: Sun Jul 13 17:49:27 2014
New Revision: 268594
URL: http://svnweb.freebsd.org/changeset/base/268594

Log:
  MFC 267963:
  The latest versoin of file/libmagic identifes 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:
  stable/10/share/examples/bhyve/vmrun.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/examples/bhyve/vmrun.sh
==============================================================================
--- stable/10/share/examples/bhyve/vmrun.sh	Sun Jul 13 17:05:03 2014	(r268593)
+++ stable/10/share/examples/bhyve/vmrun.sh	Sun Jul 13 17:49:27 2014	(r268594)
@@ -138,7 +138,7 @@ echo "Launching virtual machine \"$vmnam
 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