diff options
| author | Neel Natu <neel@FreeBSD.org> | 2014-06-27 17:18:54 +0000 |
|---|---|---|
| committer | Neel Natu <neel@FreeBSD.org> | 2014-06-27 17:18:54 +0000 |
| commit | 874a6e051b35bf28a3cd1603cc47f52a01738e4d (patch) | |
| tree | 5d748661576e597a555bf6e26923c0bc04e79f32 /share | |
| parent | 3da1cf1e88f8448bb10c5f778ab56ff65c7a6938 (diff) | |
| download | src-874a6e051b35bf28a3cd1603cc47f52a01738e4d.tar.gz src-874a6e051b35bf28a3cd1603cc47f52a01738e4d.zip | |
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.
Notes
Notes:
svn path=/head/; revision=267963
Diffstat (limited to 'share')
| -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 d043846c3592..33d0db9ffc19 100755 --- a/share/examples/bhyve/vmrun.sh +++ b/share/examples/bhyve/vmrun.sh @@ -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 |