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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
