Attachment #194877 for bug #229515

View | Details | Raw Unified | Return to bug 229515
Collapse All | Expand All

Lines 1-8 Link Here

(-)Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= vm-bhyve	3	PORTNAME= vm-bhyve
4	PORTVERSION= 1.1.8	4	PORTVERSION= 1.2.2
5	PORTREVISION= 2
6	DISTVERSIONPREFIX=v	5	DISTVERSIONPREFIX=v
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8		7

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1496917755	1	TIMESTAMP = 1530694001
2	SHA256 (churchers-vm-bhyve-v1.1.8_GH0.tar.gz) = 2c716a03a4d94d0867fd081d5dc0abc342d66a23208b606e659d10eed56c3114	2	SHA256 (churchers-vm-bhyve-v1.2.2_GH0.tar.gz) = b80a0549e0ae3b09fac03f3ba4fdb84a758fc2982d5eb154c6d98be27b1fcc55
3	SIZE (churchers-vm-bhyve-v1.1.8_GH0.tar.gz) = 54985	3	SIZE (churchers-vm-bhyve-v1.2.2_GH0.tar.gz) = 65186




--- lib/vm-util.orig
+++ lib/vm-util
@@ -55,7 +55,7 @@
 # @modifies VM_NO_UG
 #
 util::check_bhyve_support(){
-    local _mesg _result
+    local _mesg _mesg1 _mesg2 _result
 
     # basic checks
     [ `id -u` -ne 0 ] && util::err "virtual machines can only be managed by root"
@@ -73,7 +73,9 @@
     fi
 
     # check ept for intel
-    _mesg=$(grep -E '^[ ]+VT-x' /var/run/dmesg.boot | tail -n 1)
+    _mesg1=$(grep -E '^[ ]+VT-x' /var/run/dmesg.boot | tail -n 1)
+    _mesg2=$(grep -E '^[ ]+Secondary Processor Controls' /var/run/dmesg.boot | tail -n 1)
+    _mesg="${_mesg1}${_mesg2}"
 
     if [ -n "${_mesg}" ]; then
 

Lines 1-11 Link Here

(-)files/patch-lib_vm-zfs (-11 lines)
1	--- lib/vm-zfs.orig
2	+++ lib/vm-zfs
3	@@ -45,7 +45,7 @@
4
5	# check for zfs storage location
6	# user should specify "zfs:pool/dataset" if they want ZFS support
7	- if [ ${vm_dir%%:*} = "zfs" ]; then
8	+ if [ "${vm_dir%%:*}" = "zfs" ]; then
9
10	# check zfs running
11	kldstat -qm zfs >/dev/null 2>&1

Lines 1-4 Link Here

(-)pkg-message (-7 / +3 lines)
1	To enable vm-bhyve, please add the following lines to /etc/rc.conf,	1	To enable vm-bhyve, please add the following lines to rc.conf,
2	depending on whether you are using ZFS storage or not. Please note	2	depending on whether you are using ZFS storage or not. Please note
3	that the directory or dataset specified should already exist.	3	that the directory or dataset specified should already exist.
4		4
Lines 14-24 Link Here
14		14
15	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!	15	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
16		16
17	If upgrading from 1.0 or earlier, please note that the 'guest'	17	Please note, if upgrading from version 1.1, it is advised to shutdown guests
18	configuration option is no longer used.	18	and restart the host in order to re-create all virtual switches using new identifiers.
19		19
20	Guests that are not using UEFI boot will need either loader="grub"
21	or loader="bhyveload" in their configuration in order to make sure
22	the correct loader is used.
23
24	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!	20	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!




lib/vm-bhyve/vm-datastore
lib/vm-bhyve/vm-guest
lib/vm-bhyve/vm-info
lib/vm-bhyve/vm-migration
lib/vm-bhyve/vm-rctl
lib/vm-bhyve/vm-run
lib/vm-bhyve/vm-switch
lib/vm-bhyve/vm-switch-manual
lib/vm-bhyve/vm-switch-standard
lib/vm-bhyve/vm-switch-vale
lib/vm-bhyve/vm-switch-vxlan
lib/vm-bhyve/vm-util
lib/vm-bhyve/vm-zfs
man/man8/vm.8.gz
sbin/vm
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alpine.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arch.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos6.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos7.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.sample
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coreos.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/default.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dragonfly.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freebsd-zvol.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freepbx.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/netbsd.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/openbsd.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resflash.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ubuntu.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/windows.conf

Return to bug 229515

Lines 1-22 Link Here

(-)files/patch-lib_vm-util (-22 lines)
1	--- lib/vm-util.orig
2	+++ lib/vm-util
3	@@ -55,7 +55,7 @@
4	# @modifies VM_NO_UG
5	#
6	util::check_bhyve_support(){
7	- local _mesg _result
8	+ local _mesg _mesg1 _mesg2 _result
9
10	# basic checks
11	[ `id -u` -ne 0 ] && util::err "virtual machines can only be managed by root"
12	@@ -73,7 +73,9 @@
13	fi
14
15	# check ept for intel
16	- _mesg=$(grep -E '^[ ]+VT-x' /var/run/dmesg.boot \| tail -n 1)
17	+ _mesg1=$(grep -E '^[ ]+VT-x' /var/run/dmesg.boot \| tail -n 1)
18	+ _mesg2=$(grep -E '^[ ]+Secondary Processor Controls' /var/run/dmesg.boot \| tail -n 1)
19	+ _mesg="${_mesg1}${_mesg2}"
20
21	if [ -n "${_mesg}" ]; then
22

Lines 5-25 Link Here

(-)pkg-plist (+10 lines)
5	lib/vm-bhyve/vm-datastore	5	lib/vm-bhyve/vm-datastore
6	lib/vm-bhyve/vm-guest	6	lib/vm-bhyve/vm-guest
7	lib/vm-bhyve/vm-info	7	lib/vm-bhyve/vm-info
		8	lib/vm-bhyve/vm-migration
8	lib/vm-bhyve/vm-rctl	9	lib/vm-bhyve/vm-rctl
9	lib/vm-bhyve/vm-run	10	lib/vm-bhyve/vm-run
10	lib/vm-bhyve/vm-switch	11	lib/vm-bhyve/vm-switch
		12	lib/vm-bhyve/vm-switch-manual
		13	lib/vm-bhyve/vm-switch-standard
		14	lib/vm-bhyve/vm-switch-vale
		15	lib/vm-bhyve/vm-switch-vxlan
11	lib/vm-bhyve/vm-util	16	lib/vm-bhyve/vm-util
12	lib/vm-bhyve/vm-zfs	17	lib/vm-bhyve/vm-zfs
13	man/man8/vm.8.gz	18	man/man8/vm.8.gz
14	sbin/vm	19	sbin/vm
15	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alpine.conf	20	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alpine.conf
		21	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arch.conf
16	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos6.conf	22	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos6.conf
17	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos7.conf	23	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos7.conf
18	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.sample	24	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.sample
		25	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coreos.conf
19	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.conf	26	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.conf
20	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/default.conf	27	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/default.conf
		28	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dragonfly.conf
21	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freebsd-zvol.conf	29	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freebsd-zvol.conf
		30	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freepbx.conf
22	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/netbsd.conf	31	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/netbsd.conf
23	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/openbsd.conf	32	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/openbsd.conf
		33	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resflash.conf
24	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ubuntu.conf	34	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ubuntu.conf
25	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/windows.conf	35	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/windows.conf