Index: branches/2018Q3/sysutils/vm-bhyve/files/patch-lib_vm-zfs =================================================================== --- branches/2018Q3/sysutils/vm-bhyve/files/patch-lib_vm-zfs (revision 476921) +++ branches/2018Q3/sysutils/vm-bhyve/files/patch-lib_vm-zfs (nonexistent) @@ -1,11 +0,0 @@ ---- lib/vm-zfs.orig -+++ lib/vm-zfs -@@ -45,7 +45,7 @@ - - # check for zfs storage location - # user should specify "zfs:pool/dataset" if they want ZFS support -- if [ ${vm_dir%%:*} = "zfs" ]; then -+ if [ "${vm_dir%%:*}" = "zfs" ]; then - - # check zfs running - kldstat -qm zfs >/dev/null 2>&1 Property changes on: branches/2018Q3/sysutils/vm-bhyve/files/patch-lib_vm-zfs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q3/sysutils/vm-bhyve/files/patch-lib_vm-util =================================================================== --- branches/2018Q3/sysutils/vm-bhyve/files/patch-lib_vm-util (revision 476921) +++ branches/2018Q3/sysutils/vm-bhyve/files/patch-lib_vm-util (nonexistent) @@ -1,22 +0,0 @@ ---- 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 - Property changes on: branches/2018Q3/sysutils/vm-bhyve/files/patch-lib_vm-util ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q3/sysutils/vm-bhyve/Makefile =================================================================== --- branches/2018Q3/sysutils/vm-bhyve/Makefile (revision 476921) +++ branches/2018Q3/sysutils/vm-bhyve/Makefile (revision 476922) @@ -1,33 +1,32 @@ # $FreeBSD$ PORTNAME= vm-bhyve -PORTVERSION= 1.1.8 -PORTREVISION= 2 +PORTVERSION= 1.2.3 DISTVERSIONPREFIX=v CATEGORIES= sysutils MAINTAINER= churchers@gmail.com COMMENT= Management system for bhyve virtual machines LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss OPTIONS_DEFINE= EXAMPLES EXAMPLES_DESC= Install example guest templates USE_GITHUB= yes GH_ACCOUNT= churchers NO_ARCH= yes NO_BUILD= yes do-install: ${INSTALL_SCRIPT} ${WRKSRC}/vm ${STAGEDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/vm ${STAGEDIR}${PREFIX}/etc/rc.d (cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/vm-bhyve) (cd ${WRKSRC}/sample-templates/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) ${INSTALL_MAN} ${WRKSRC}/vm.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .include Index: branches/2018Q3/sysutils/vm-bhyve/distinfo =================================================================== --- branches/2018Q3/sysutils/vm-bhyve/distinfo (revision 476921) +++ branches/2018Q3/sysutils/vm-bhyve/distinfo (revision 476922) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496917755 -SHA256 (churchers-vm-bhyve-v1.1.8_GH0.tar.gz) = 2c716a03a4d94d0867fd081d5dc0abc342d66a23208b606e659d10eed56c3114 -SIZE (churchers-vm-bhyve-v1.1.8_GH0.tar.gz) = 54985 +TIMESTAMP = 1533896629 +SHA256 (churchers-vm-bhyve-v1.2.3_GH0.tar.gz) = a29020702e2c5940c0c9d5660137f3e3012ade77b2b666342cdd2c5fc4fc1d2b +SIZE (churchers-vm-bhyve-v1.2.3_GH0.tar.gz) = 65196 Index: branches/2018Q3/sysutils/vm-bhyve/pkg-message =================================================================== --- branches/2018Q3/sysutils/vm-bhyve/pkg-message (revision 476921) +++ branches/2018Q3/sysutils/vm-bhyve/pkg-message (revision 476922) @@ -1,24 +1,20 @@ -To enable vm-bhyve, please add the following lines to /etc/rc.conf, +To enable vm-bhyve, please add the following lines to rc.conf, depending on whether you are using ZFS storage or not. Please note that the directory or dataset specified should already exist. vm_enable="YES" vm_dir="zfs:pool/dataset" OR vm_enable="YES" vm_dir="/directory/path" Then run 'vm init'. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -If upgrading from 1.0 or earlier, please note that the 'guest' -configuration option is no longer used. - -Guests that are not using UEFI boot will need either loader="grub" -or loader="bhyveload" in their configuration in order to make sure -the correct loader is used. +Please note, if upgrading from version 1.1, it is advised to shutdown guests +and restart the host in order to re-create all virtual switches using new identifiers. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Index: branches/2018Q3/sysutils/vm-bhyve/pkg-plist =================================================================== --- branches/2018Q3/sysutils/vm-bhyve/pkg-plist (revision 476921) +++ branches/2018Q3/sysutils/vm-bhyve/pkg-plist (revision 476922) @@ -1,25 +1,35 @@ etc/rc.d/vm lib/vm-bhyve/vm-cmd lib/vm-bhyve/vm-config lib/vm-bhyve/vm-core 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 Index: branches/2018Q3 =================================================================== --- branches/2018Q3 (revision 476921) +++ branches/2018Q3 (revision 476922) Property changes on: branches/2018Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r474004,476918