diff options
| author | jhb <jhb@FreeBSD.org> | 2014-07-13 17:49:27 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2014-07-13 17:49:27 +0000 |
| commit | 1a3e3125d00ec2dbd62dfa5c70db0ab7a2946efe (patch) | |
| tree | 585365056a236709ed981bc6bf071add1c3cb066 /share/examples | |
| parent | 8ff513fb4230361fcdbf8cdb2c081f77a8444c61 (diff) | |
| download | FreeBSD-src-1a3e3125d00ec2dbd62dfa5c70db0ab7a2946efe.zip FreeBSD-src-1a3e3125d00ec2dbd62dfa5c70db0ab7a2946efe.tar.gz | |
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.
Diffstat (limited to 'share/examples')
| -rwxr-xr-x | share/examples/bhyve/vmrun.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh index 6134915..03f17b7 100755 --- a/share/examples/bhyve/vmrun.sh +++ b/share/examples/bhyve/vmrun.sh @@ -138,7 +138,7 @@ echo "Launching virtual machine \"$vmname\" ..." 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 |
