From 94bb1a841646d8ce4d05610d11ca03d7846da90f Mon Sep 17 00:00:00 2001
From: Matt Churchyard <churchers@gmail.com>
Date: Tue, 19 Apr 2016 11:20:23 +0100
Subject: [PATCH] Remove guest from man and smaples

---
 sample-templates/alpine.conf       |  1 -
 sample-templates/centos6.conf      |  1 -
 sample-templates/config.sample     | 15 ---------------
 sample-templates/debian.conf       |  1 -
 sample-templates/default.conf      |  1 -
 sample-templates/freebsd-zvol.conf |  1 -
 sample-templates/netbsd.conf       |  1 -
 sample-templates/openbsd.conf      |  1 -
 sample-templates/ubuntu.conf       |  1 -
 sample-templates/windows.conf      |  1 -
 vm                                 |  2 +-
 vm.8                               |  3 ---
 12 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/sample-templates/alpine.conf b/sample-templates/alpine.conf
index 7b3aa8d..c61afb9 100644
--- a/sample-templates/alpine.conf
+++ b/sample-templates/alpine.conf
@@ -1,4 +1,3 @@
-guest="linux"
 loader="grub"
 cpu=1
 memory=512M
diff --git a/sample-templates/centos6.conf b/sample-templates/centos6.conf
index 7402d2b..5d40c38 100644
--- a/sample-templates/centos6.conf
+++ b/sample-templates/centos6.conf
@@ -1,4 +1,3 @@
-guest="linux"
 loader="grub"
 cpu=1
 memory=512M
diff --git a/sample-templates/config.sample b/sample-templates/config.sample
index 33d95be..245f6b3 100644
--- a/sample-templates/config.sample
+++ b/sample-templates/config.sample
@@ -13,21 +13,6 @@
 # The '#' character signifies the start of a comment, even within
 # double-quotes, and so cannot be used inside any values.
 
-# guest
-# The type of operating system this virtual machine will use.
-# Different systems often require specific steps to load the
-# virtual machine, or specific bhyve options. The generic option
-# does no specific loading and can be used for standard uefi guests.
-#
-# This is no longer a required option and will default to 'generic'
-# if not specified. If set to freebsd, the bhyveload loader is 
-# automatically used, and if set to linux, grub-bhyve will be used.
-#
-# Default: generic
-# Valid Options: freebsd,linux,windows,generic
-#
-guest=""
-
 # loader
 # If the guest you are using requires either bhyveload or grub-bhyve,
 # specify the loader to use here. If the guest is freebsd or linux,
diff --git a/sample-templates/debian.conf b/sample-templates/debian.conf
index 8d2db1a..4024598 100644
--- a/sample-templates/debian.conf
+++ b/sample-templates/debian.conf
@@ -1,4 +1,3 @@
-guest="linux"
 loader="grub"
 cpu=1
 memory=512M
diff --git a/sample-templates/default.conf b/sample-templates/default.conf
index 3fe1d4b..a95af04 100644
--- a/sample-templates/default.conf
+++ b/sample-templates/default.conf
@@ -1,4 +1,3 @@
-guest="freebsd"
 loader="bhyveload"
 cpu=1
 memory=256M
diff --git a/sample-templates/freebsd-zvol.conf b/sample-templates/freebsd-zvol.conf
index 61c901c..9efa8e9 100644
--- a/sample-templates/freebsd-zvol.conf
+++ b/sample-templates/freebsd-zvol.conf
@@ -1,4 +1,3 @@
-guest="freebsd"
 loader="bhyveload"
 cpu=1
 memory=256M
diff --git a/sample-templates/netbsd.conf b/sample-templates/netbsd.conf
index 72ec3dd..5a91467 100644
--- a/sample-templates/netbsd.conf
+++ b/sample-templates/netbsd.conf
@@ -1,4 +1,3 @@
-guest="generic"
 loader="grub"
 cpu=1
 memory=256M
diff --git a/sample-templates/openbsd.conf b/sample-templates/openbsd.conf
index 6b7b813..84cb1d7 100644
--- a/sample-templates/openbsd.conf
+++ b/sample-templates/openbsd.conf
@@ -1,4 +1,3 @@
-guest="generic"
 loader="grub"
 cpu=1
 memory=256M
diff --git a/sample-templates/ubuntu.conf b/sample-templates/ubuntu.conf
index 8d2db1a..4024598 100644
--- a/sample-templates/ubuntu.conf
+++ b/sample-templates/ubuntu.conf
@@ -1,4 +1,3 @@
-guest="linux"
 loader="grub"
 cpu=1
 memory=512M
diff --git a/sample-templates/windows.conf b/sample-templates/windows.conf
index 0444ad8..7eeb0c5 100644
--- a/sample-templates/windows.conf
+++ b/sample-templates/windows.conf
@@ -1,4 +1,3 @@
-guest="windows"
 uefi="yes"
 cpu=1
 memory=2G
diff --git a/vm b/vm
index 20ba748..9685181 100644
--- a/vm
+++ b/vm
@@ -25,7 +25,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 VERSION=1.1-alpha
-VERSION_INT=101014
+VERSION_INT=101015
 VERSION_BSD=$(uname -K)
 PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin
 
diff --git a/vm.8 b/vm.8
index 34e30bc..9eeab84 100644
--- a/vm.8
+++ b/vm.8
@@ -716,9 +716,6 @@ files, making them easy to edit by hand. The settings for each guest are stored
 .Pa $vm_dir/$vm_name/$vm_name.conf .
 An overview of the available configuration options is listed below.
 .Bl -tag -width 17n
-.It guest
-Specify the type of guest to be installed in this virtual machine. Current valid options
-for this are generic, freebsd, linux & windows.
 .It loader
 Windows, Linux & FreeBSD guests will use the correct loader by default. For other
 guests that require a loader to be used, this can set to