From 513b81d7d15688e1d5f9ef59ae4721b4ff3a465c Mon Sep 17 00:00:00 2001
From: Matt Churchyard <churchers@gmail.com>
Date: Mon, 2 May 2016 18:17:39 +0100
Subject: [PATCH] Fix critical bug in ZFS support

---
 lib/vm-cmd  | 4 +---
 lib/vm-core | 4 ++--
 vm          | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/vm-cmd b/lib/vm-cmd
index af9032f4..c1e65b51 100644
--- a/lib/vm-cmd
+++ b/lib/vm-cmd
@@ -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
@@ -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
diff --git a/lib/vm-core b/lib/vm-core
index 7ef7fd77..79febc2f 100644
--- a/lib/vm-core
+++ b/lib/vm-core
@@ -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
 }
 
diff --git a/vm b/vm
index 34a6a469..0798da52 100644
--- a/vm
+++ b/vm
@@ -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