Skip to content

Commit

Permalink
Fix critical bug in ZFS support
Browse files Browse the repository at this point in the history
  • Loading branch information
churchers committed May 2, 2016
1 parent f681b4e commit 513b81d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
4 changes: 1 addition & 3 deletions lib/vm-cmd
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ __parse_switch_cmd(){
}

# look for any arguments to the vm command
# -d /dir - change the global vm_dir to specified value
# -f - run vm-bhyve/loader/bhyve in the foreground
# -f - run vm-bhyve/loader/bhyve in the foreground
#
# the argument string without any options is put into
# VM_COMMAND for the main command parser to handle
Expand All @@ -104,7 +103,6 @@ __parse_cmd_args(){

while getopts d:f _opt; do
case ${_opt} in
d) vm_dir="${OPTARG}" ;;
f) VM_FOREGROUND="1" ;;
esac
done
Expand Down
4 changes: 2 additions & 2 deletions lib/vm-core
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,9 @@ __vm_start(){
# run background process to actually start bhyve
# this will run as long as vm is running, including restarting bhyve after guest reboot
if [ -n "${VM_FOREGROUND}" ]; then
$0 -fd "${vm_dir}" _run "${_name}" "${_iso}"
$0 -f _run "${_name}" "${_iso}"
else
$0 -d "${vm_dir}" _run "${_name}" "${_iso}" >/dev/null 2>&1 &
$0 _run "${_name}" "${_iso}" >/dev/null 2>&1 &
fi
}

Expand Down
4 changes: 2 additions & 2 deletions vm
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

VERSION=1.0
VERSION_INT=100008
VERSION=1.0-p1
VERSION_INT=100009
VERSION_BSD=$(uname -K)
PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin

Expand Down

0 comments on commit 513b81d

Please sign in to comment.